[FFmpeg-devel] [PATCH]Use CONFIG_LIBXVID_ENCODER in ratecontrol.c

[Carl Eugen Hoyos]

Hi!

Is this patch (that fixes an MPlayer linking problem) acceptable?

Carl Eugen
-------------- next part --------------
Index: libavcodec/ratecontrol.c
===================================================================
--- libavcodec/ratecontrol.c	(revision 24103)
+++ libavcodec/ratecontrol.c	(working copy)
@@ -184,7 +184,7 @@
 
         //FIXME maybe move to end
         if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID) {
-#if CONFIG_LIBXVID
+#if CONFIG_LIBXVID_ENCODER
             return ff_xvid_rate_control_init(s);
 #else
             av_log(s->avctx, AV_LOG_ERROR, "Xvid ratecontrol requires libavcodec compiled with Xvid support.\n");
@@ -257,7 +257,7 @@
     av_free_expr(rcc->rc_eq_eval);
     av_freep(&rcc->entry);
 
-#if CONFIG_LIBXVID
+#if CONFIG_LIBXVID_ENCODER
     if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID)
         ff_xvid_rate_control_uninit(s);
 #endif
@@ -673,7 +673,7 @@
     Picture * const pic= &s->current_picture;
     emms_c();
 
-#if CONFIG_LIBXVID
+#if CONFIG_LIBXVID_ENCODER
     if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID)
         return ff_xvid_rate_estimate_qscale(s, dry_run);
 #endif