mpegvideo_enc: allow mpeg_quant to be set in mpeg2video
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 May 2013 14:07:07 +0000 (16:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 30 May 2013 14:07:07 +0000 (16:07 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo_enc.c

index 6a0f3b5..de018e3 100644 (file)
@@ -535,7 +535,8 @@ av_cold int ff_MPV_encode_init(AVCodecContext *avctx)
     }
 
     // FIXME mpeg2 uses that too
-    if (s->mpeg_quant && s->codec_id != AV_CODEC_ID_MPEG4) {
+    if (s->mpeg_quant && (   s->codec_id != AV_CODEC_ID_MPEG4
+                          && s->codec_id != AV_CODEC_ID_MPEG2VIDEO)) {
         av_log(avctx, AV_LOG_ERROR,
                "mpeg2 style quantization not supported by codec\n");
         return -1;