aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2011-05-04 18:47:07 +0200
committerDiego Biurrun <diego@biurrun.de>2011-05-04 21:12:40 +0200
commit61165a1bba939e520d01b5f029100fd700b51f2f (patch)
tree00d66a48bf7358d6b3b3077a1003a5740351dcb4
parent091018e0dd0e2600b62324bce0e7146d7d300f44 (diff)
downloadffmpeg-61165a1bba939e520d01b5f029100fd700b51f2f.tar.gz
Fix standalone compilation of WTV demuxer.
-rw-r--r--libavcodec/Makefile1
-rw-r--r--libavformat/Makefile3
2 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 7434157e8f..1d8452ac03 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -546,6 +546,7 @@ OBJS-$(CONFIG_SPDIF_DEMUXER) += aacadtsdec.o mpeg4audio.o
OBJS-$(CONFIG_WEBM_MUXER) += xiph.o mpeg4audio.o \
flacdec.o flacdata.o flac.o \
mpegaudiodata.o
+OBJS-$(CONFIG_WTV_DEMUXER) += mpeg4audio.o mpegaudiodata.o
# external codec libraries
OBJS-$(CONFIG_LIBDIRAC_DECODER) += libdiracdec.o
diff --git a/libavformat/Makefile b/libavformat/Makefile
index e2e3982125..ba978af7a4 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -295,7 +295,8 @@ OBJS-$(CONFIG_WEBM_MUXER) += matroskaenc.o matroska.o \
flacenc_header.o avlanguage.o
OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood.o
OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood.o
-OBJS-$(CONFIG_WTV_DEMUXER) += wtv.o asf.o asfdec.o mpegts.o riff.o
+OBJS-$(CONFIG_WTV_DEMUXER) += wtv.o asfdec.o asf.o asfcrypt.o \
+ avlanguage.o mpegts.o isom.o riff.o
OBJS-$(CONFIG_WV_DEMUXER) += wv.o apetag.o
OBJS-$(CONFIG_XA_DEMUXER) += xa.o
OBJS-$(CONFIG_XWMA_DEMUXER) += xwma.o riff.o