summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-02-16 19:51:26 +0100
committerDiego Biurrun <diego@biurrun.de>2016-02-18 15:35:45 +0100
commit82454c3a826bc8aa42474097784b70befd5be532 (patch)
treeb5bbbe48b66ef7605c83b86c9de921afe2008d90 /libavformat
parentde3b134be3f5fc2f860a78c0af1ab59ba50811ae (diff)
build: Let the WTV demuxer select the MPEG-TS demuxer
The WTV demuxer depends on large parts of the MPEG-TS demuxer internals anyway and fails to build without it.
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index c5d1bfa202..8e37538f75 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -362,7 +362,7 @@ OBJS-$(CONFIG_WEBM_MUXER) += matroskaenc.o matroska.o \
OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood_aud.o
OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood_vqa.o
OBJS-$(CONFIG_WTV_DEMUXER) += wtv.o asfdec.o asf.o asfcrypt.o \
- avlanguage.o mpegts.o isom.o
+ avlanguage.o
OBJS-$(CONFIG_WV_DEMUXER) += wvdec.o wv.o apetag.o img2.o
OBJS-$(CONFIG_WV_MUXER) += wvenc.o wv.o apetag.o img2.o
OBJS-$(CONFIG_XA_DEMUXER) += xa.o