summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-02-24 17:46:10 +0000
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-02-24 17:46:10 +0000
commit34e4c588c8e86fc407f8a67942434949f51b7da6 (patch)
treefba7ed12afa96dab869b7ee739d03522a1210677 /configure
parent3c5a040ad94d0758e5b8949b049926f172812ef2 (diff)
parent82454c3a826bc8aa42474097784b70befd5be532 (diff)
Merge commit '82454c3a826bc8aa42474097784b70befd5be532'
* commit '82454c3a826bc8aa42474097784b70befd5be532': build: Let the WTV demuxer select the MPEG-TS demuxer build: Adjust mpeg4video parser dependencies build: Fix mpegvideo component dependencies build: Fix dependencies for components relying on H.263 data tables Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index e1ead49f78..df31a57879 100755
--- a/configure
+++ b/configure
@@ -2736,8 +2736,8 @@ wav_demuxer_select="riffdec"
wav_muxer_select="riffenc"
webm_muxer_select="riffenc"
webm_dash_manifest_demuxer_select="matroska_demuxer"
-wtv_demuxer_select="riffdec"
-wtv_muxer_select="riffenc"
+wtv_demuxer_select="mpegts_demuxer riffdec"
+wtv_muxer_select="mpegts_muxer riffenc"
xmv_demuxer_select="riffdec"
xwma_demuxer_select="riffdec"