summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2010-10-05 20:10:01 +0000
committerMartin Storsjö <martin@martin.st>2010-10-05 20:10:01 +0000
commit038d46c9c84d77a0645451dc4812e97fb0a74679 (patch)
treeae837a83aa66a3655fcc8636e34318ddccc18e4b
parenta8d69098f482f81e5bfcf0c04eca2072444c1a72 (diff)
downloadffmpeg-streaming-038d46c9c84d77a0645451dc4812e97fb0a74679.zip
ffmpeg-streaming-038d46c9c84d77a0645451dc4812e97fb0a74679.tar.gz
configure: Consolidate rtsp/sdp deps to use _select
This makes e.g. --disable-everything --enable-demuxer=rtsp actually enable the rtsp demuxer and everything else that is needed. Originally committed as revision 25356 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure9
1 files changed, 3 insertions, 6 deletions
diff --git a/configure b/configure
index 7e7be90..7fa99da 100755
--- a/configure
+++ b/configure
@@ -1360,12 +1360,9 @@ mpegtsraw_demuxer_select="mpegts_demuxer"
mxf_d10_muxer_select="mxf_muxer"
ogg_demuxer_select="golomb"
psp_muxer_select="mov_muxer"
-rtsp_demuxer_deps="sdp_demuxer"
-rtsp_demuxer_select="http_protocol"
-rtsp_muxer_deps="sdp_demuxer"
-rtsp_muxer_select="rtp_muxer http_protocol"
-sdp_demuxer_deps="rtp_protocol mpegts_demuxer"
-sdp_demuxer_select="asf_demuxer rm_demuxer"
+rtsp_demuxer_select="http_protocol sdp_demuxer"
+rtsp_muxer_select="rtp_muxer http_protocol sdp_demuxer"
+sdp_demuxer_select="asf_demuxer rm_demuxer rtp_protocol mpegts_demuxer"
spdif_muxer_select="aac_parser"
tg2_muxer_select="mov_muxer"
tgp_muxer_select="mov_muxer"
OpenPOWER on IntegriCloud