[FFmpeg-devel] SVN 23679: missing dependency for demuxer oma

[Måns Rullgård]

Michael Karcher <ffmpeg at mkarcher.dialup.fu-berlin.de> writes:

> Am Dienstag, den 22.06.2010, 08:52 -0700 schrieb Thierry Foucu:
>> ../svn/configure --disable-everything --cc=gcc --enable-demuxer=oma
>> /usr/local/google/ffmpeg/svn/libavformat/id3v2.c:142: undefined
>> reference to `ff_id3v1_genre_st
>
> This is caused by id3v2.o depending on id3v1.o. "oma" is not the only
> demuxer declaring only id3v2.o as dependency, but a lot of "raw"
> demuxers also did it that way. The reasons the "raw" demuxers were not
> getting errors is that they in fact do *not* depend on id3v2.o and this
> object is ignored at link time.
>
> The attached patch removes the superflous id3v2.o dependencies.
>
> Regards,
>   Michael Karcher
> Index: libavformat/Makefile
> ===================================================================
> --- libavformat/Makefile	(Revision 23733)
> +++ libavformat/Makefile	(Arbeitskopie)
> @@ -55,14 +55,14 @@
>  OBJS-$(CONFIG_DNXHD_DEMUXER)             += raw.o
>  OBJS-$(CONFIG_DNXHD_MUXER)               += raw.o
>  OBJS-$(CONFIG_DSICIN_DEMUXER)            += dsicin.o
> -OBJS-$(CONFIG_DTS_DEMUXER)               += raw.o id3v2.o
> +OBJS-$(CONFIG_DTS_DEMUXER)               += raw.o
>  OBJS-$(CONFIG_DTS_MUXER)                 += raw.o
>  OBJS-$(CONFIG_DV_DEMUXER)                += dv.o
>  OBJS-$(CONFIG_DV_MUXER)                  += dvenc.o
>  OBJS-$(CONFIG_DXA_DEMUXER)               += dxa.o riff.o
>  OBJS-$(CONFIG_EA_CDATA_DEMUXER)          += eacdata.o
>  OBJS-$(CONFIG_EA_DEMUXER)                += electronicarts.o
> -OBJS-$(CONFIG_EAC3_DEMUXER)              += raw.o id3v2.o
> +OBJS-$(CONFIG_EAC3_DEMUXER)              += raw.o
>  OBJS-$(CONFIG_EAC3_MUXER)                += raw.o
>  OBJS-$(CONFIG_FFM_DEMUXER)               += ffmdec.o
>  OBJS-$(CONFIG_FFM_MUXER)                 += ffmenc.o
> @@ -80,7 +80,7 @@
>  OBJS-$(CONFIG_FRAMECRC_MUXER)            += framecrcenc.o
>  OBJS-$(CONFIG_FRAMEMD5_MUXER)            += md5enc.o
>  OBJS-$(CONFIG_GIF_MUXER)                 += gif.o
> -OBJS-$(CONFIG_GSM_DEMUXER)               += raw.o id3v2.o
> +OBJS-$(CONFIG_GSM_DEMUXER)               += raw.o
>  OBJS-$(CONFIG_GXF_DEMUXER)               += gxf.o
>  OBJS-$(CONFIG_GXF_MUXER)                 += gxfenc.o audiointerleave.o
>  OBJS-$(CONFIG_H261_DEMUXER)              += raw.o
> @@ -111,7 +111,7 @@
>  OBJS-$(CONFIG_MD5_MUXER)                 += md5enc.o
>  OBJS-$(CONFIG_MJPEG_DEMUXER)             += raw.o
>  OBJS-$(CONFIG_MJPEG_MUXER)               += raw.o
> -OBJS-$(CONFIG_MLP_DEMUXER)               += raw.o id3v2.o
> +OBJS-$(CONFIG_MLP_DEMUXER)               += raw.o
>  OBJS-$(CONFIG_MLP_MUXER)                 += raw.o
>  OBJS-$(CONFIG_MM_DEMUXER)                += mm.o
>  OBJS-$(CONFIG_MMF_DEMUXER)               += mmf.o raw.o
> @@ -230,7 +230,7 @@
>                                              rtpdec_h264.o \
>                                              rtpdec_xiph.o
>  OBJS-$(CONFIG_SEGAFILM_DEMUXER)          += segafilm.o
> -OBJS-$(CONFIG_SHORTEN_DEMUXER)           += raw.o id3v2.o
> +OBJS-$(CONFIG_SHORTEN_DEMUXER)           += raw.o
>  OBJS-$(CONFIG_SIFF_DEMUXER)              += siff.o
>  OBJS-$(CONFIG_SMACKER_DEMUXER)           += smacker.o
>  OBJS-$(CONFIG_SOL_DEMUXER)               += sol.o raw.o
> @@ -243,7 +243,7 @@
>  OBJS-$(CONFIG_THP_DEMUXER)               += thp.o
>  OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER)        += tiertexseq.o
>  OBJS-$(CONFIG_TMV_DEMUXER)               += tmv.o
> -OBJS-$(CONFIG_TRUEHD_DEMUXER)            += raw.o id3v2.o
> +OBJS-$(CONFIG_TRUEHD_DEMUXER)            += raw.o
>  OBJS-$(CONFIG_TRUEHD_MUXER)              += raw.o
>  OBJS-$(CONFIG_TTA_DEMUXER)               += tta.o id3v1.o id3v2.o
>  OBJS-$(CONFIG_TXD_DEMUXER)               += txd.o

Looks OK.

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