aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2010-03-15 23:11:02 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2010-03-15 23:11:02 +0000
commit48b2ef95b3411dc55cd6dae25c93b841d73db17e (patch)
tree2570b9377fbe42cec0ed9dfa1c5ca14de6ecc869 /libavcodec
parentfbe8c56dfeb531d815dec1419624bb1c60739100 (diff)
downloadffmpeg-48b2ef95b3411dc55cd6dae25c93b841d73db17e.tar.gz
mpegts muxer now needs mpeg4audio code like adts muxer
Originally committed as revision 22560 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 66d974cdf5..e61c419a93 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -477,6 +477,7 @@ 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