[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec mpegvideo.c,1.481,1.482

[Michael Niedermayer CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv26262

Modified Files:
	mpegvideo.c 
Log Message:
b_frame_strategy sanity check


Index: mpegvideo.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegvideo.c,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -d -r1.481 -r1.482
--- mpegvideo.c	8 May 2005 20:15:42 -0000	1.481
+++ mpegvideo.c	12 May 2005 01:31:11 -0000	1.482
@@ -1065,6 +1065,11 @@
         return -1;
     }
         
+    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");
+        return -1;
+    }
+
     i= ff_gcd(avctx->time_base.den, avctx->time_base.num);
     if(i > 1){
         av_log(avctx, AV_LOG_INFO, "removing common factors from framerate\n");