Merge commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Aug 2014 16:33:46 +0000 (18:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Aug 2014 16:33:46 +0000 (18:33 +0200)
* commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2':
  vfwcap: Drop fallback VfW defines

Conflicts:
libavdevice/vfwcap.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavdevice/vfwcap.c

  #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;