[Ffmpeg-cvslog] r5425 - trunk/libavcodec/mpegvideo.c

[corey]

Author: corey
Date: Tue May 30 00:44:16 2006
New Revision: 5425

Modified:
   trunk/libavcodec/mpegvideo.c

Log:
Make b_frame_strategy not fail on pass 2, but still print a notice.

Modified: trunk/libavcodec/mpegvideo.c
==============================================================================
--- trunk/libavcodec/mpegvideo.c	(original)
+++ trunk/libavcodec/mpegvideo.c	Tue May 30 00:44:16 2006
@@ -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);