Merge branch 'cacheondemand' of https://github.com/olive-editor/olive into cacheondemand

This commit is contained in:
itsmattkc
2020-05-21 21:46:25 +10:00
+5 -1
View File
@@ -370,7 +370,7 @@ bool FFmpegEncoder::InitializeStream(AVMediaType type, AVStream** stream_ptr, AV
}
// Retrieve codec
AVCodecID codec_id;
AVCodecID codec_id = AV_CODEC_ID_NONE;
switch (codec) {
case ExportCodec::kCodecDNxHD:
@@ -407,6 +407,10 @@ bool FFmpegEncoder::InitializeStream(AVMediaType type, AVStream** stream_ptr, AV
codec_id = AV_CODEC_ID_PCM_S16LE;
break;
case ExportCodec::kCodecCount:
break;
}
if (codec_id == AV_CODEC_ID_NONE) {
Error(QStringLiteral("Unknown internal codec"));
return false;
}