aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2016-02-20 00:29:55 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2016-02-20 00:29:55 +0100
commite6cbe3ffef8b456eb70a5f8e03559dbd776dff68 (patch)
tree3146de9e6f48ecfce88b5878e742cfbdf9870e87
parent308ac2f7e2048e09a4f98b5c6ca4562fc7010d18 (diff)
downloadffmpeg-e6cbe3ffef8b456eb70a5f8e03559dbd776dff68.tar.gz
configure: Fix webm_dash_manifest demuxer standalone compilation.
-rwxr-xr-xconfigure1
-rw-r--r--libavformat/Makefile4
2 files changed, 1 insertions, 4 deletions
diff --git a/configure b/configure
index 287896f8ce..a78e228e23 100755
--- a/configure
+++ b/configure
@@ -2731,6 +2731,7 @@ w64_muxer_select="wav_muxer"
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"
xmv_demuxer_select="riffdec"
diff --git a/libavformat/Makefile b/libavformat/Makefile
index aace6f7de7..b98c1a3805 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -476,10 +476,6 @@ OBJS-$(CONFIG_WEBM_MUXER) += matroskaenc.o matroska.o \
flacenc_header.o avlanguage.o \
wv.o vorbiscomment.o \
webmdashenc.o webm_chunk.o
-OBJS-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER)+= matroskadec.o matroska.o \
- isom.o rmsipr.o flac_picture.o \
- oggparsevorbis.o vorbiscomment.o \
- flac_picture.o replaygain.o
OBJS-$(CONFIG_WEBM_DASH_MANIFEST_MUXER) += webmdashenc.o matroska.o
OBJS-$(CONFIG_WEBM_CHUNK_MUXER) += webm_chunk.o matroska.o
OBJS-$(CONFIG_WEBP_MUXER) += webpenc.o