[FFmpeg-cvslog] r9466 - trunk/libavcodec/ratecontrol.c

[diego]

Author: diego
Date: Tue Jul  3 11:12:55 2007
New Revision: 9466

Log:
CONFIG_XVID --> CONFIG_LIBXVID


Modified:
   trunk/libavcodec/ratecontrol.c

Modified: trunk/libavcodec/ratecontrol.c
==============================================================================
--- trunk/libavcodec/ratecontrol.c	(original)
+++ trunk/libavcodec/ratecontrol.c	Tue Jul  3 11:12:55 2007
@@ -184,7 +184,7 @@ int ff_rate_control_init(MpegEncContext 
 
         //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 @@ void ff_rate_control_uninit(MpegEncConte
     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 @@ float ff_rate_estimate_qscale(MpegEncCon
     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