[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec ratecontrol.c,1.56,1.57

[Michael Niedermayer CVS]

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

Modified Files:
	ratecontrol.c 
Log Message:
fix frametypes with xvid_rc


Index: ratecontrol.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/ratecontrol.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- ratecontrol.c	17 Mar 2006 16:40:10 -0000	1.56
+++ ratecontrol.c	18 Mar 2006 20:43:48 -0000	1.57
@@ -117,6 +117,9 @@
 
             p= next;
         }
+
+        if(init_pass2(s) < 0) return -1;
+
         //FIXME maybe move to end
         if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID) {
 #ifdef CONFIG_XVID
@@ -126,8 +129,6 @@
             return -1;
 #endif
         }
-
-        if(init_pass2(s) < 0) return -1;
     }
 
     if(!(s->flags&CODEC_FLAG_PASS2)){