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
This commit is contained in:
Corey Hickey 2006-05-29 22:44:16 +00:00
parent fc861443d3
commit b29183a150

View File

@ -1123,8 +1123,8 @@ int MPV_encode_init(AVCodecContext *avctx)
} }
if(avctx->b_frame_strategy && (avctx->flags&CODEC_FLAG_PASS2)){ 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"); av_log(avctx, AV_LOG_INFO, "notice: b_frame_strategy only affects the first pass\n");
return -1; avctx->b_frame_strategy = 0;
} }
i= ff_gcd(avctx->time_base.den, avctx->time_base.num); i= ff_gcd(avctx->time_base.den, avctx->time_base.num);