summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure4
-rw-r--r--libavdevice/vfwcap.c12
2 files changed, 2 insertions, 14 deletions
diff --git a/configure b/configure
index 605bf3fa21..7b0f615b97 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c
index 078c18668c..83e499c9da 100644
--- a/libavdevice/vfwcap.c
+++ b/libavdevice/vfwcap.c
@@ -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