Commit 4a580352 authored by ramiro's avatar ramiro

Remove --disable-{v4l,v4l2} options from configure

--disable-demuxer={v4l,v4l2} should be used instead

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@10413 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent a1db7483
...@@ -122,8 +122,6 @@ show_help(){ ...@@ -122,8 +122,6 @@ show_help(){
echo " --disable-altivec disable AltiVec usage" echo " --disable-altivec disable AltiVec usage"
echo " --disable-audio-oss disable OSS audio support [default=no]" echo " --disable-audio-oss disable OSS audio support [default=no]"
echo " --disable-audio-beos disable BeOS 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-bktr disable bktr video grabbing [default=no]"
echo " --disable-network disable network support [default=no]" echo " --disable-network disable network support [default=no]"
echo " --disable-ipv6 disable ipv6 support [default=no]" echo " --disable-ipv6 disable ipv6 support [default=no]"
...@@ -624,8 +622,6 @@ CONFIG_LIST=" ...@@ -624,8 +622,6 @@ CONFIG_LIST="
small small
swscaler swscaler
vhook vhook
v4l
v4l2
x11grab x11grab
zlib zlib
" "
...@@ -791,8 +787,8 @@ redir_demuxer_deps="network" ...@@ -791,8 +787,8 @@ redir_demuxer_deps="network"
rtp_muxer_deps="network mpegts_demuxer" rtp_muxer_deps="network mpegts_demuxer"
rtsp_demuxer_deps="rtp_protocol rtp_muxer" rtsp_demuxer_deps="rtp_protocol rtp_muxer"
sdp_demuxer_deps="rtsp_demuxer" sdp_demuxer_deps="rtsp_demuxer"
v4l2_demuxer_deps="v4l2" v4l2_demuxer_deps="linux_videodev2_h"
v4l_demuxer_deps="v4l" v4l_demuxer_deps="linux_videodev_h"
x11_grab_device_demuxer_deps="x11grab" x11_grab_device_demuxer_deps="x11grab"
# protocols # protocols
...@@ -852,8 +848,6 @@ targetos=$(tolower $(uname -s)) ...@@ -852,8 +848,6 @@ targetos=$(tolower $(uname -s))
# non-library system interfaces # non-library system interfaces
audio_oss="yes" audio_oss="yes"
bktr="yes" bktr="yes"
v4l2="yes"
v4l="yes"
# libraries # libraries
zlib="yes" zlib="yes"
...@@ -1698,8 +1692,8 @@ int main( void ) { ...@@ -1698,8 +1692,8 @@ int main( void ) {
} }
EOF EOF
enabled v4l && check_header linux/videodev.h || disable v4l check_header linux/videodev.h
enabled v4l2 && check_header linux/videodev2.h || disable v4l2 check_header linux/videodev2.h
# check for ioctl_meteor.h, ioctl_bt848.h and alternatives # check for ioctl_meteor.h, ioctl_bt848.h and alternatives
if enabled bktr; then if enabled bktr; then
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment