Skip to content

F
ffmpeg
Commit bc4b7221 authored by Ramiro Polla's avatar Ramiro Polla
Browse files
Options

mingw: update w32api to 3.13 

Originally committed as revision 16029 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 7100376f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 14 deletions
configure
View file @ bc4b7221
......@@ -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
......
libavdevice/vfwcap.c
View file @ bc4b7221
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment