Merge commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2'

* commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2':
  vfwcap: Drop fallback VfW defines

Conflicts:
	libavdevice/vfwcap.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c
index d311799..60a5e8e 100644 (file)
--- a/libavdevice/vfwcap.c
+++ b/libavdevice/vfwcap.c
@@ -27,12 +27,6 @@
 #include <vfw.h>
 #include "avdevice.h"
 
-/* Defines for VFW missing from MinGW.
- * Remove this when MinGW incorporates them. */
-#define HWND_MESSAGE                ((HWND)-3)
-
-/* End of missing MinGW defines */
-
 struct vfw_ctx {
     const AVClass *class;
     HWND hwnd;