From b29183a1504d47479ece9d9625ab8ed2f62b8c56 Mon Sep 17 00:00:00 2001 From: Corey Hickey Date: Mon, 29 May 2006 22:44:16 +0000 Subject: Make b_frame_strategy not fail on pass 2, but still print a notice. Originally committed as revision 5425 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpegvideo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/mpegvideo.c') diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 222f63f009..dac57c6cd0 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1123,8 +1123,8 @@ int MPV_encode_init(AVCodecContext *avctx) } if(avctx->b_frame_strategy && (avctx->flags&CODEC_FLAG_PASS2)){ - av_log(avctx, AV_LOG_ERROR, "b_frame_strategy must be 0 on the second pass\n"); - return -1; + av_log(avctx, AV_LOG_INFO, "notice: b_frame_strategy only affects the first pass\n"); + avctx->b_frame_strategy = 0; } i= ff_gcd(avctx->time_base.den, avctx->time_base.num); -- cgit v1.2.3