virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

rename video4linux[2] variables to v4l[2], consistent with --disable options

Browse Source 
Originally committed as revision 7984 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård
2007-02-14 22:12:49 +00:00
parent cc58300e30
commit afde41b414
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
configure vendored
View File

@@ -507,8 +507,8 @@ CONFIG_LIST='
protocols protocols
swscaler swscaler
vhook vhook
video4linux v4l
video4linux2 v4l2
wince wince
x11grab x11grab
x264 x264
@@ -618,8 +618,8 @@ redir_demuxer_deps="network"
rtp_muxer_deps="network" rtp_muxer_deps="network"
rtsp_demuxer_deps="network" rtsp_demuxer_deps="network"
sdp_demuxer_deps="network" sdp_demuxer_deps="network"
v4l2_demuxer_deps="video4linux2" v4l2_demuxer_deps="v4l2"
video_grab_device_demuxer_deps_any="video4linux bktr" video_grab_device_demuxer_deps_any="v4l bktr"
x11_grab_device_demuxer_deps="x11grab" x11_grab_device_demuxer_deps="x11grab"
ffplay_deps="sdl" ffplay_deps="sdl"
@@ -745,8 +745,8 @@ audio_beos="no"
audio_oss="yes" audio_oss="yes"
bktr="yes" bktr="yes"
dv1394="yes" dv1394="yes"
video4linux2="yes" v4l2="yes"
video4linux="yes" v4l="yes"
# libraries # libraries
amr_if2="no" amr_if2="no"
@@ -1030,10 +1030,6 @@ for opt do
;; ;;
--cpu=*) cpu="$optval" --cpu=*) cpu="$optval"
;; ;;
--disable-v4l) video4linux="no"
;;
--disable-v4l2) video4linux2="no"
;;
--enable-mingwce) wince="yes" --enable-mingwce) wince="yes"
;; ;;
--disable-opts) optimize="no" --disable-opts) optimize="no"
@@ -1643,8 +1639,8 @@ int main( void ) {
} }
EOF EOF
enabled video4linux && check_header linux/videodev.h || disable video4linux enabled v4l && check_header linux/videodev.h || disable v4l
enabled video4linux2 && check_header linux/videodev2.h || disable video4linux2 enabled v4l2 && check_header linux/videodev2.h || disable v4l2
# 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

2
libavformat/Makefile
View File

@@ -140,7 +140,7 @@ OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o riff.o
OBJS+= framehook.o OBJS+= framehook.o
ifeq ($(CONFIG_VIDEO4LINUX),yes) ifeq ($(CONFIG_V4L),yes)
OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab.o OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab.o
endif endif