Commit c18a3b3e authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '8bc52dbd'

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

Conflicts:
	libavdevice/vfwcap.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents b07dc81a 8bc52dbd
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment