changeset 3065:b2c352a66a73 libavcodec

10l forgot #ifdef CONFIG_XVID
author michael
date Wed, 25 Jan 2006 02:16:27 +0000
parents a5e0b58b4471
children 04b924f8f5a5
files ratecontrol.c
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ratecontrol.c	Tue Jan 24 21:57:26 2006 +0000
+++ b/ratecontrol.c	Wed Jan 25 02:16:27 2006 +0000
@@ -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);