aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2007-02-11 14:22:28 +0000
committerMåns Rullgård <mans@mansr.com>2007-02-11 14:22:28 +0000
commita2830dca2b688c94fa76c052f5355c6f9dc32cb5 (patch)
treefa438b012d2e2222d97f66a269885fad55afcb13
parent4b62f9f965b269aa6884eefd6a297d9008419d50 (diff)
downloadffmpeg-a2830dca2b688c94fa76c052f5355c6f9dc32cb5.tar.gz
tidy up ffserver deps
Originally committed as revision 7928 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure8
1 files changed, 5 insertions, 3 deletions
diff --git a/configure b/configure
index 19c463430f..003b83d193 100755
--- a/configure
+++ b/configure
@@ -576,6 +576,8 @@ v4l2_demuxer_deps="video4linux2"
video_grab_device_demuxer_deps_any="video4linux bktr"
x11_grab_device_demuxer_deps="x11grab"
+ffserver_deps="network protocols muxers"
+
# set temporary file name
if test ! -z "$TMPDIR" ; then
TMPDIR1="${TMPDIR}"
@@ -1000,7 +1002,7 @@ for opt do
;;
--disable-dv1394) dv1394="no"
;;
- --disable-network) network="no"; ffserver="no"
+ --disable-network) network="no"
;;
--disable-ipv6) ipv6="no"
;;
@@ -1068,7 +1070,7 @@ for opt do
;;
--disable-mpegaudio-hp) mpegaudio_hp="no"
;;
- --disable-protocols) protocols="no"; network="no"; ffserver="no"
+ --disable-protocols) protocols="no"; network="no"
;;
--disable-ffmpeg) ffmpeg="no"
;;
@@ -1120,7 +1122,7 @@ for opt do
;;
--disable-muxer=*) disable ${optval}_muxer
;;
- --disable-muxers) disable $MUXER_LIST; ffserver="no"
+ --disable-muxers) disable $MUXER_LIST
;;
--enable-demuxer=*) enable ${optval}_demuxer
;;