diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2010-07-11 22:17:17 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2012-06-02 19:25:58 -0400 |
| commit | baba561c0b0ee449837f727df5f88c038b7d2569 (patch) | |
| tree | a5a9ae7d0cb573353976b8f9842a5d91b31b74a2 | |
| parent | f6147effd2e998007b30510f723ab75cd549b226 (diff) | |
| download | ffmpeg-baba561c0b0ee449837f727df5f88c038b7d2569.tar.gz | |
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.buitenhuis@gmail.com>
Conflicts:
configure
| -rwxr-xr-x | configure | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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 && |