mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2'
* commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2': vfwcap: Drop fallback VfW defines Conflicts: libavdevice/vfwcap.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
c18a3b3e8e
|
@ -27,12 +27,6 @@
|
||||||
#include <vfw.h>
|
#include <vfw.h>
|
||||||
#include "avdevice.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 {
|
struct vfw_ctx {
|
||||||
const AVClass *class;
|
const AVClass *class;
|
||||||
HWND hwnd;
|
HWND hwnd;
|
||||||
|
|
Loading…
Reference in New Issue