diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-30 16:07:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-30 16:07:07 +0200 |
| commit | 6f7de3d5c8a5bafb3bb8a311c1251ac7cc43de67 (patch) | |
| tree | af2f12046a074eb011887ec35cd4e8875c1633f3 /libavcodec/mpegvideo_enc.c | |
| parent | 62d00aa22f28532edc192bd9bf92e815ff78304e (diff) | |
| download | android_external_ffmpeg-6f7de3d5c8a5bafb3bb8a311c1251ac7cc43de67.tar.gz android_external_ffmpeg-6f7de3d5c8a5bafb3bb8a311c1251ac7cc43de67.tar.bz2 android_external_ffmpeg-6f7de3d5c8a5bafb3bb8a311c1251ac7cc43de67.zip | |
mpegvideo_enc: allow mpeg_quant to be set in mpeg2video
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 6a0f3b50ce..de018e33ac 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -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; |