aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2010-03-15 23:40:51 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2010-03-15 23:40:51 +0000
commitf5beb9a8a138cac0b70b40ebe31f55ae479089ce (patch)
tree2c8013124afd7a8da21f813f7d6e0e133b7b96f4 /libavcodec
parent4a0cf686f8f29d1b68213376d22835e3d590fd72 (diff)
downloadffmpeg-f5beb9a8a138cac0b70b40ebe31f55ae479089ce.tar.gz
100L, revert r22560, already present
Originally committed as revision 22564 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index e61c419a93..66d974cdf5 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -477,7 +477,6 @@ OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER) += adpcm.o
OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcm.o
# libavformat dependencies
-OBJS-$(CONFIG_MPEGTS_MUXER) += mpeg4audio.o
OBJS-$(CONFIG_ADTS_MUXER) += mpeg4audio.o
OBJS-$(CONFIG_CAF_DEMUXER) += mpeg4audio.o mpegaudiodata.o
OBJS-$(CONFIG_DV_DEMUXER) += dvdata.o