changeset 3321:8869b4dd2ffe libavcodec

Make b_frame_strategy not fail on pass 2, but still print a notice.
author corey
date Mon, 29 May 2006 22:44:16 +0000
parents 888e539459f4
children 0b4f548dfb44
files mpegvideo.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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);