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

[Måns Rullgård]

Carl Eugen Hoyos <cehoyos at ag.or.at> writes:

> Hi!
>
> Is this patch (that fixes an MPlayer linking problem) acceptable?
>
> Carl Eugen
>
> 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);

Is someone compiling with --enable-libxvid --disable-encoder=libxvid
and expecting useful results?

The correct fix is obviously to compile libxvid_rc.c even if the
encoder wrapper is disabled.

-- 
M?ns Rullg?rd
mans at mansr.com