build: Let the WTV demuxer select the MPEG-TS demuxer
authorDiego Biurrun <diego@biurrun.de>
Tue, 16 Feb 2016 18:51:26 +0000 (19:51 +0100)
committerDiego Biurrun <diego@biurrun.de>
Thu, 18 Feb 2016 14:35:45 +0000 (15:35 +0100)
The WTV demuxer depends on large parts of the MPEG-TS demuxer internals
anyway and fails to build without it.

configure
libavcodec/Makefile
libavformat/Makefile

index 28d8d98..ff50613 100755 (executable)
--- a/configure
+++ b/configure
@@ -2304,7 +2304,7 @@ wav_demuxer_select="riffdec"
 wav_muxer_select="riffenc"
 webm_muxer_select="riffenc"
 webm_muxer_suggest="libopus_encoder libvorbis_encoder libvpx_vp8_encoder libvpx_vp9_encoder"
-wtv_demuxer_select="riffdec"
+wtv_demuxer_select="mpegts_demuxer riffdec"
 xmv_demuxer_select="riffdec"
 xwma_demuxer_select="riffdec"
 
index c4f80ae..b93a5f4 100644 (file)
@@ -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
index c5d1bfa..8e37538 100644 (file)
@@ -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