a little bit more bitstream syntax for the residual

[ffmpeg] / configure

diff --git a/configure b/configure
index 16b90f5ed30ccca891a4d3b66b36eeacd12a7ee8..43e66a5b57366a1d0c9b4408edc1be7a2defa2ff 100755 (executable)
--- a/configure
+++ b/configure
@@ -120,10 +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-audio-beos     disable BeOS audio support [default=no]"
-  echo "  --disable-v4l            disable video4linux grabbing [default=no]"
-  echo "  --disable-v4l2           disable video4linux2 grabbing [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]"
@@ -587,8 +583,6 @@ COMPONENT_LIST="
 
 CONFIG_LIST="
     $COMPONENT_LIST
-    audio_beos
-    audio_oss
     avisynth
     beos_netserver
     bktr
@@ -624,8 +618,6 @@ CONFIG_LIST="
     small
     swscaler
     vhook
-    v4l
-    v4l2
     x11grab
     zlib
 "
@@ -778,21 +770,23 @@ libxvid_encoder_deps="libxvid"
 
 # demuxers / muxers
 ac3_demuxer_deps="ac3_parser"
-audio_demuxer_deps_any="audio_oss audio_beos"
-audio_muxer_deps_any="audio_oss audio_beos"
+audio_beos_demuxer_deps="audio_beos"
+audio_beos_muxer_deps="audio_beos"
+bktr_demuxer_deps="bktr"
 dv1394_demuxer_deps="dv1394"
 libdc1394_demuxer_deps="libdc1394"
 libnut_demuxer_deps="libnut"
 libnut_muxer_deps="libnut"
 mp3_demuxer_deps="mpegaudio_parser"
 ogg_muxer_deps="libogg"
+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"
 sdp_demuxer_deps="rtsp_demuxer"
-v4l2_demuxer_deps="v4l2"
-video_grab_bktr_demuxer_deps="bktr"
-video_grab_v4l_demuxer_deps="v4l"
+v4l2_demuxer_deps="linux_videodev2_h"
+v4l_demuxer_deps="linux_videodev_h"
 x11_grab_device_demuxer_deps="x11grab"
 
 # protocols
@@ -850,10 +844,7 @@ cpu="generic"
 targetos=$(tolower $(uname -s))
 
 # non-library system interfaces
-audio_oss="yes"
 bktr="yes"
-v4l2="yes"
-v4l="yes"
 
 # libraries
 zlib="yes"
@@ -1110,7 +1101,7 @@ case $targetos in
     LDCONFIG="echo ignoring ldconfig"
     SHFLAGS=-nostart
     # enable BeOS things
-    disabled audio_beos || enable_audio_beos
+    audio_beos="yes"
     # no need for libm, but the inet stuff
     # Check for BONE
     # XXX: actually should check for NOT net_server
@@ -1573,22 +1564,22 @@ EOF
 enabled_any libamr_nb libamr_wb && enable libamr
 
 # these are off by default, so fail if requested and not available
+enabled avisynth   && require2 vfw32 "windows.h vfw.h" AVIFileInit -lvfw32
 enabled liba52     && require liba52 a52dec/a52.h a52_init -la52
 enabled libamr_nb  && require libamrnb amrnb/interf_dec.h Speech_Decode_Frame_init -lamrnb -lm
 enabled libamr_wb  && require libamrwb amrwb/dec_if.h D_IF_init -lamrwb -lm
 enabled libdc1394  && require libdc1394 libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394
+enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
+enabled libfaad    && require2 libfaad faad.h faacDecOpen -lfaad
 enabled libgsm     && require libgsm gsm.h gsm_create -lgsm
 enabled libmp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm
+enabled libnut     && require libnut libnut.h nut_demuxer_init -lnut
+enabled libogg     && require libogg ogg/ogg.h ogg_sync_init -logg
 enabled libtheora  && require libtheora theora/theora.h theora_info_init -ltheora -logg
 enabled libvorbis  && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbis -lvorbisenc -logg
-enabled libogg     && require libogg ogg/ogg.h ogg_sync_init -logg
-enabled libnut     && require libnut libnut.h nut_demuxer_init -lnut
 enabled libx264    && require x264 x264.h x264_encoder_open -lx264
 enabled libxvid    && require Xvid xvid.h xvid_global -lxvidcore
 enabled mlib       && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib
-enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
-enabled libfaad    && require2 libfaad faad.h faacDecOpen -lfaad
-enabled avisynth   && require2 vfw32 "windows.h vfw.h" AVIFileInit -lvfw32
 
 # disable the native AC-3 decoder if liba52 is enabled
 enabled liba52 && disable ac3_decoder
@@ -1698,8 +1689,8 @@ int main( void ) {
 }
 EOF
 
-enabled v4l  && check_header linux/videodev.h  || disable v4l
-enabled v4l2 && check_header linux/videodev2.h || disable v4l2
+check_header linux/videodev.h
+check_header linux/videodev2.h
 
 # check for ioctl_meteor.h, ioctl_bt848.h and alternatives
 if enabled bktr; then
@@ -1713,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                         &&