[FFmpeg-cvslog] build: Fix CAF demuxer dependencies
Diego Biurrun
git at videolan.org
Sun Apr 7 14:58:53 CEST 2013
ffmpeg | branch: release/0.10 | Diego Biurrun <diego at biurrun.de> | Tue Jul 10 18:42:13 2012 +0200| [6a9f050c225e7c54cdbb6d4098458cff94d954c5] | committer: Diego Biurrun
build: Fix CAF demuxer dependencies
(cherry picked from commit a519463366238a7ec05d2bb76c4a67f42cf60ece)
Conflicts:
libavcodec/Makefile
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6a9f050c225e7c54cdbb6d4098458cff94d954c5
---
libavcodec/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 5a4fa4c..da8fd54 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -533,7 +533,8 @@ OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcmenc.o adpcm_data.o
# libavformat dependencies
OBJS-$(CONFIG_ADTS_MUXER) += mpeg4audio.o
OBJS-$(CONFIG_ADX_DEMUXER) += adx.o
-OBJS-$(CONFIG_CAF_DEMUXER) += mpeg4audio.o mpegaudiodata.o
+OBJS-$(CONFIG_CAF_DEMUXER) += mpeg4audio.o mpegaudiodata.o \
+ ac3tab.o
OBJS-$(CONFIG_DV_DEMUXER) += dvdata.o
OBJS-$(CONFIG_DV_MUXER) += dvdata.o
OBJS-$(CONFIG_FLAC_DEMUXER) += flacdec.o flacdata.o flac.o
More information about the ffmpeg-cvslog
mailing list