aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-08-05 20:39:58 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-08-05 20:39:58 +0000
commit9cc440bfc43d36ea46584d377d11eed82096e5be (patch)
tree5cc30c7c998abb7980ed3b761e84462ef10a0ffa
parent71e9a1b8dd82d96649158e1dfd439fe093503fdd (diff)
downloadffmpeg-9cc440bfc43d36ea46584d377d11eed82096e5be.tar.gz
Prevent low delay from being used with mpeg1.
Originally committed as revision 14627 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/mpegvideo_enc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 0e8e6d8426..1ec9d058b5 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -440,8 +440,8 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
}
if(s->flags & CODEC_FLAG_LOW_DELAY){
- if (s->codec_id != CODEC_ID_MPEG2VIDEO && s->codec_id != CODEC_ID_MPEG1VIDEO){
- av_log(avctx, AV_LOG_ERROR, "low delay forcing is only available for mpeg1/2\n");
+ if (s->codec_id != CODEC_ID_MPEG2VIDEO){
+ av_log(avctx, AV_LOG_ERROR, "low delay forcing is only available for mpeg2\n");
return -1;
}
if (s->max_b_frames != 0){