Module: libav
Branch: release/0.5
Commit: baba561c0b0ee449837f727df5f88c038b7d2569
Author: Ramiro Polla <ramiro.po...@gmail.com>
Committer: Derek Buitenhuis <derek.buitenh...@gmail.com>
Date: Sun Jul 11 22:17:17 2010 +0000
mingw32: properly check if vfw capture is supported by the system headers
Remove check for an specific w32api version, checking instead if vfw.h
supports vfw capture. The defines in w32api 3.12 were wrong, so this must be
accounted for in the check.
Originally committed as revision 24203 to svn://svn.ffmpeg.org/ffmpeg/trunk
(cherry picked from commit ec1ee802a2e1cb3317bd44851cc28f95b5916051)
Signed-off-by: Derek Buitenhuis <derek.buitenh...@gmail.com>
Conflicts:
configure
---
configure | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index 61db28c..835535f 100755
--- a/configure
+++ b/configure
@@ -1131,7 +1131,7 @@ rtsp_demuxer_deps="sdp_demuxer"
sdp_demuxer_deps="rtp_protocol mpegts_demuxer"
v4l_demuxer_deps="linux_videodev_h"
v4l2_demuxer_deps_any="linux_videodev2_h sys_videoio_h"
-vfwcap_demuxer_deps="capCreateCaptureWindow"
+vfwcap_demuxer_deps="capCreateCaptureWindow vfwcap_defines"
vfwcap_demuxer_extralibs="-lavicap32"
x11_grab_device_demuxer_deps="x11grab XShmCreateImage"
x11_grab_device_demuxer_extralibs="-lX11 -lXext"
@@ -1614,10 +1614,7 @@ case $target_os in
if ! check_cpp_condition _mingw.h "defined (__MINGW64_VERSION_MAJOR)";
then
check_cpp_condition _mingw.h "(__MINGW32_MAJOR_VERSION > 3) ||
(__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" ||
die "ERROR: MinGW runtime version must be >= 3.15."
- enabled_any avisynth vfwcap_demuxer &&
- { check_cpp_condition w32api.h "(__W32API_MAJOR_VERSION > 3)
|| (__W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION >= 13)" ||
- die "ERROR: avisynth and vfwcap_demuxer require w32api
version 3.13 or later."; }
- fi
+ fi
;;
cygwin*)
target_os=cygwin
@@ -2150,6 +2147,9 @@ check_header linux/videodev2.h
check_header sys/videoio.h
check_func_headers "windows.h vfw.h" capCreateCaptureWindow -lavicap32
+# check that WM_CAP_DRIVER_CONNECT is defined to the proper value
+# w32api 3.12 had it defined wrong
+check_cpp_condition vfw.h "WM_CAP_DRIVER_CONNECT > WM_USER" && enable
vfwcap_defines
# check for ioctl_meteor.h, ioctl_bt848.h and alternatives
{ check_header dev/bktr/ioctl_meteor.h &&
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
