[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec ratecontrol.c,1.54,1.55

[Michael Niedermayer CVS]

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

Modified Files:
	ratecontrol.c 
Log Message:
10l forgot #ifdef CONFIG_XVID


Index: ratecontrol.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/ratecontrol.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- ratecontrol.c	24 Jan 2006 21:57:26 -0000	1.54
+++ ratecontrol.c	25 Jan 2006 02:16:27 -0000	1.55
@@ -117,10 +117,11 @@
 
             p= next;
         }
-
+#ifdef CONFIG_XVID
         //FIXME maybe move to end
         if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID)
             return ff_xvid_rate_control_init(s);
+#endif
 
         if(init_pass2(s) < 0) return -1;
     }
@@ -187,8 +188,10 @@
 
     av_freep(&rcc->entry);
 
+#ifdef CONFIG_XVID
     if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID)
         ff_xvid_rate_control_uninit(s);
+#endif
 }
 
 static inline double qp2bits(RateControlEntry *rce, double qp){
@@ -648,8 +651,10 @@
     Picture * const pic= &s->current_picture;
     emms_c();
 
+#ifdef CONFIG_XVID
     if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID)
         return ff_xvid_rate_estimate_qscale(s, dry_run);
+#endif
 
     get_qminmax(&qmin, &qmax, s, pict_type);