projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c3829f7
)
build: Fix CAF demuxer dependencies
author
Diego Biurrun
<diego@biurrun.de>
Tue, 10 Jul 2012 16:42:13 +0000
(18:42 +0200)
committer
Diego Biurrun
<diego@biurrun.de>
Mon, 25 Feb 2013 19:34:26 +0000
(20:34 +0100)
(cherry picked from commit
a519463366238a7ec05d2bb76c4a67f42cf60ece
)
Conflicts:
libavcodec/Makefile
libavcodec/Makefile
patch
|
blob
|
history
diff --git
a/libavcodec/Makefile
b/libavcodec/Makefile
index 5a4fa4cbe9267fdb7f8ffc207ac013db18e45c20..da8fd549b4048be76d0c793c772ca3f2f32303e4 100644
(file)
--- 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