diff options
| author | Michael Karcher <ffmpeg@mkarcher.dialup.fu-berlin.de> | 2010-07-05 04:07:50 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2010-07-05 04:07:50 +0000 |
| commit | 03f0d1757568611c9150103c445e647d09149f70 (patch) | |
| tree | 1ae2b32f09eccc32561cc3a4e9227000b30e5a10 /libavformat | |
| parent | 513d567152d8fd637a65177df74ad2e6ccf6b0b2 (diff) | |
| download | ffmpeg-03f0d1757568611c9150103c445e647d09149f70.tar.gz | |
Remove superfluous id3v2.o dependency for dts, eac3, gsm, mlp, shorten, and
truehd demuxers
Patch by Michael Karcher <ffmpeg at mkarcher dot dialup dot fu-berlin dot de>
Originally committed as revision 24053 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 19dabfd2d0..4249428180 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -55,14 +55,14 @@ OBJS-$(CONFIG_DIRAC_MUXER) += raw.o 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_FOURXM_DEMUXER) += 4xm.o 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_MATROSKA_MUXER) += matroskaenc.o matroska.o \ 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 @@ -232,7 +232,7 @@ OBJS-$(CONFIG_SDP_DEMUXER) += rtsp.o \ rtpdec_svq3.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 @@ -245,7 +245,7 @@ OBJS-$(CONFIG_SWF_MUXER) += swfenc.o 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 |