# HG changeset patch # User corey # Date 1148942656 0 # Node ID 8869b4dd2ffe68f49608ea56022a8d919c061608 # Parent 888e539459f4b174017f03e1ef246967e0aa4d2f Make b_frame_strategy not fail on pass 2, but still print a notice. diff -r 888e539459f4 -r 8869b4dd2ffe mpegvideo.c --- a/mpegvideo.c Mon May 29 19:25:46 2006 +0000 +++ b/mpegvideo.c Mon May 29 22:44:16 2006 +0000 @@ -1123,8 +1123,8 @@ } 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);