Merge commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2'

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

Conflicts:
	libavdevice/vfwcap.c

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

diff --cc libavdevice/vfwcap.c
index d311799,c067be3..60a5e8e
--- 1/libavdevice/vfwcap.c
--- 2/libavdevice/vfwcap.c
+++ b/libavdevice/vfwcap.c
@@@ -25,14 -26,7 +25,8 @@@
  #include "libavutil/parseutils.h"
  #include <windows.h>
  #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;