[MPlayer-cvslog] r34243 - in trunk: configure libmpcodecs/ae_lavc.clibmpdemux/demux_lavf.clibmpdemux/mp_taglists.clibmpdemux/mp_taglists.hlibmpdemux/muxer_lavf.c

[Carl Eugen Hoyos]

reimar <subversion <at> mplayerhq.hu> writes:

> Change codec tag/id conversion to not use ff_codec_bmp_tags/ff_codec_wav_tags.
> 
> This fixes linking against latest FFmpeg dynamic libs.

> Modified: trunk/configure
> ==============================================================================
> --- trunk/configure	Sun Oct 23 14:03:40 2011	(r34242)
> +++ trunk/configure	Sun Oct 23 14:12:43 2011	(r34243)
> @@ -7112,7 +7112,8 @@ if test "$_mencoder" = yes ; then
>  else
>    # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
>    libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER SNOW_ENCODER"
> -  libavmuxers=""
> +  # needed for codec id -> tag conversion
> +  libavmuxers="AVI_MUXER"

This breaks --disable-mencoder, because riff.c compiles ff_start_tag() and
ff_end_tag() - needed for avienc.o - only if CONFIG_MUXERS is defined.

Carl Eugen