# HG changeset patch
# User diego
# Date 1183453975 0
# Node ID d71791d72286458303a919d0dcda45d759c2643d
# Parent  07005ff96430464388a4da0e2d0d0c655256e681
CONFIG_XVID --> CONFIG_LIBXVID

diff -r 07005ff96430 -r d71791d72286 ratecontrol.c
--- a/ratecontrol.c	Tue Jul 03 02:52:40 2007 +0000
+++ b/ratecontrol.c	Tue Jul 03 09:12:55 2007 +0000
@@ -184,7 +184,7 @@
 
         //FIXME maybe move to end
         if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID) {
-#ifdef CONFIG_XVID
+#ifdef CONFIG_LIBXVID
             return ff_xvid_rate_control_init(s);
 #else
             av_log(s->avctx, AV_LOG_ERROR, "XviD ratecontrol requires libavcodec compiled with XviD support\n");
@@ -260,7 +260,7 @@
     ff_eval_free(rcc->rc_eq_eval);
     av_freep(&rcc->entry);
 
-#ifdef CONFIG_XVID
+#ifdef CONFIG_LIBXVID
     if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID)
         ff_xvid_rate_control_uninit(s);
 #endif
@@ -676,7 +676,7 @@
     Picture * const pic= &s->current_picture;
     emms_c();
 
-#ifdef CONFIG_XVID
+#ifdef CONFIG_LIBXVID
     if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID)
         return ff_xvid_rate_estimate_qscale(s, dry_run);
 #endif