Module: libav Branch: release/0.8 Commit: 6a9f050c225e7c54cdbb6d4098458cff94d954c5
Author: Diego Biurrun <[email protected]> Committer: Diego Biurrun <[email protected]> Date: Tue Jul 10 18:42:13 2012 +0200 build: Fix CAF demuxer dependencies (cherry picked from commit a519463366238a7ec05d2bb76c4a67f42cf60ece) Conflicts: libavcodec/Makefile --- libavcodec/Makefile | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) 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 _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
