diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2008-12-07 05:17:57 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2008-12-07 05:17:57 +0000 |
| commit | bc4b72214320725f5e5a81197dc5ab70dc9d7e58 (patch) | |
| tree | 2f1179425b902ea5e7bc9e97a37306e24c038552 | |
| parent | 7100376f75cf2917974b6c514d8c32e5622f92f0 (diff) | |
| download | ffmpeg-bc4b72214320725f5e5a81197dc5ab70dc9d7e58.tar.gz | |
mingw: update w32api to 3.13
Originally committed as revision 16029 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | libavdevice/vfwcap.c | 12 |
2 files changed, 2 insertions, 14 deletions
@@ -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 |