aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
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 /libavcodec
parentde3b134be3f5fc2f860a78c0af1ab59ba50811ae (diff)
downloadffmpeg-82454c3a826bc8aa42474097784b70befd5be532.tar.gz
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 'libavcodec')
-rw-r--r--libavcodec/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index c4f80ae872..b93a5f4171 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -650,7 +650,6 @@ OBJS-$(CONFIG_SPDIF_MUXER) += dca.o
OBJS-$(CONFIG_TAK_DEMUXER) += tak.o
OBJS-$(CONFIG_WEBM_MUXER) += mpeg4audio.o mpegaudiodata.o \
flac.o flacdata.o
-OBJS-$(CONFIG_WTV_DEMUXER) += mpeg4audio.o mpegaudiodata.o
# external codec libraries
OBJS-$(CONFIG_LIBDCADEC_DECODER) += libdcadec.o dca.o