diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-07-10 18:42:13 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-02-25 20:34:26 +0100 |
| commit | 6a9f050c225e7c54cdbb6d4098458cff94d954c5 (patch) | |
| tree | ab0992287448119a5b13bda694a56f297be5704a | |
| parent | c3829f7085c5d5f5e860f301cc8285b3963913ee (diff) | |
| download | ffmpeg-6a9f050c225e7c54cdbb6d4098458cff94d954c5.tar.gz | |
build: Fix CAF demuxer dependencies
(cherry picked from commit a519463366238a7ec05d2bb76c4a67f42cf60ece)
Conflicts:
libavcodec/Makefile
| -rw-r--r-- | libavcodec/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 5a4fa4cbe9..da8fd549b4 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 |