Merge commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2'

* commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2': vfwcap: Drop fallback VfW defines Conflicts: libavdevice/vfwcap.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · c18a3b3e8e
parent b07dc81a9e 8bc52dbd9d
commit c18a3b3e8e
1 changed files with 0 additions and 6 deletions
--- 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;