[FFmpeg-cvslog] r16029 - in trunk: configure libavdevice/vfwcap.c
ramiro
subversion
Sun Dec 7 06:17:57 CET 2008
Author: ramiro
Date: Sun Dec 7 06:17:57 2008
New Revision: 16029
Log:
mingw: update w32api to 3.13
Modified:
trunk/configure
trunk/libavdevice/vfwcap.c
Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Sun Dec 7 06:17:57 2008
@@ -1462,8 +1462,8 @@ case $target_os in
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 >= 12)" ||
- die "ERROR: avisynth and vfwcap_demuxer require w32api version 3.12 or later."; }
+ { 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."; }
;;
cygwin*)
target_os=cygwin
Modified: trunk/libavdevice/vfwcap.c
==============================================================================
--- trunk/libavdevice/vfwcap.c (original)
+++ trunk/libavdevice/vfwcap.c Sun Dec 7 06:17:57 2008
@@ -27,18 +27,6 @@
/* Defines for VFW missing from MinGW.
* Remove this when MinGW incorporates them. */
-#define WM_CAP_START (0x0400)
-#define WM_CAP_SET_CALLBACK_VIDEOSTREAM (WM_CAP_START + 6)
-#define WM_CAP_DRIVER_CONNECT (WM_CAP_START + 10)
-#define WM_CAP_DRIVER_DISCONNECT (WM_CAP_START + 11)
-#define WM_CAP_GET_VIDEOFORMAT (WM_CAP_START + 44)
-#define WM_CAP_SET_VIDEOFORMAT (WM_CAP_START + 45)
-#define WM_CAP_SET_PREVIEW (WM_CAP_START + 50)
-#define WM_CAP_SET_OVERLAY (WM_CAP_START + 51)
-#define WM_CAP_SEQUENCE_NOFILE (WM_CAP_START + 63)
-#define WM_CAP_SET_SEQUENCE_SETUP (WM_CAP_START + 64)
-#define WM_CAP_GET_SEQUENCE_SETUP (WM_CAP_START + 65)
-
#define HWND_MESSAGE ((HWND)-3)
#define BI_RGB 0
More information about the ffmpeg-cvslog
mailing list