virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

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

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

Originally committed as revision 10413 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ramiro Polla 2007-09-05 18:52:14 +00:00
parent 7b1b62b23d
commit 06e310114a
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -122,8 +122,6 @@ show_help(){
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]"
@ -624,8 +622,6 @@ CONFIG_LIST="
small
swscaler
vhook
v4l
v4l2
x11grab
zlib
"
@ -791,8 +787,8 @@ 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"
v4l_demuxer_deps="v4l"
v4l2_demuxer_deps="linux_videodev2_h"
v4l_demuxer_deps="linux_videodev_h"
x11_grab_device_demuxer_deps="x11grab"
# protocols
@ -852,8 +848,6 @@ targetos=$(tolower $(uname -s))
# non-library system interfaces
audio_oss="yes"
bktr="yes"
v4l2="yes"
v4l="yes"
# libraries
zlib="yes"
@ -1698,8 +1692,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