Remove --disable-audio-oss option from configure.

--disable-(de)muxer=oss should be used instead.

Originally committed as revision 10428 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 4 insertions, 9 deletions

diff --git a/configure b/configure
index 70dc3d3cca..43e66a5b57 100755
--- a/configure
+++ b/configure
@@ -120,7 +120,6 @@ show_help(){
   echo "  --disable-armv6          disable armv6 usage"
   echo "  --disable-iwmmxt         disable iwmmxt usage"
   echo "  --disable-altivec        disable AltiVec usage"
-  echo "  --disable-audio-oss      disable OSS audio support [default=no]"
   echo "  --disable-bktr           disable bktr video grabbing [default=no]"
   echo "  --disable-network        disable network support [default=no]"
   echo "  --disable-ipv6           disable ipv6 support [default=no]"
@@ -584,7 +583,6 @@ COMPONENT_LIST="
 
 CONFIG_LIST="
     $COMPONENT_LIST
-    audio_oss
     avisynth
     beos_netserver
     bktr
@@ -781,8 +779,8 @@ libnut_demuxer_deps="libnut"
 libnut_muxer_deps="libnut"
 mp3_demuxer_deps="mpegaudio_parser"
 ogg_muxer_deps="libogg"
-oss_demuxer_deps="audio_oss"
-oss_muxer_deps="audio_oss"
+oss_demuxer_deps_any="soundcard_h sys_soundcard_h"
+oss_muxer_deps_any="soundcard_h sys_soundcard_h"
 redir_demuxer_deps="network"
 rtp_muxer_deps="network mpegts_demuxer"
 rtsp_demuxer_deps="rtp_protocol rtp_muxer"
@@ -846,7 +844,6 @@ cpu="generic"
 targetos=$(tolower $(uname -s))
 
 # non-library system interfaces
-audio_oss="yes"
 bktr="yes"
 
 # libraries
@@ -1707,10 +1704,8 @@ if enabled bktr; then
     disable bktr
 fi
 
-enabled audio_oss &&
-    check_header sys/soundcard.h ||
-    check_header soundcard.h ||
-    disable audio_oss
+check_header sys/soundcard.h
+check_header soundcard.h
 
 # Deal with the x11 frame grabber
 enabled x11grab                         &&