diff options
| author | Corey Hickey <bugfood-ml@fatooh.org> | 2006-05-29 22:44:16 +0000 |
|---|---|---|
| committer | Corey Hickey <bugfood-ml@fatooh.org> | 2006-05-29 22:44:16 +0000 |
| commit | b29183a1504d47479ece9d9625ab8ed2f62b8c56 (patch) | |
| tree | 2c858f72187bcb0edcb52d5ba119f43fede16adc | |
| parent | fc861443d3e2375ec82d4263aaa75e46701075fa (diff) | |
| download | ffmpeg-b29183a1504d47479ece9d9625ab8ed2f62b8c56.tar.gz | |
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
| -rw-r--r-- | libavcodec/mpegvideo.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |