diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-11 01:35:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-11 02:19:32 +0200 |
| commit | d4a6c9404601ccf0b035477699fa2a9b9b1f515a (patch) | |
| tree | 0e6c6b67bd824334ebbf537ed47636fc726461ce /libavdevice | |
| parent | 9fc45681e0c4736e4475966a70402d22c76a2965 (diff) | |
| parent | 4f373a5111f900af54301907132942f95276285c (diff) | |
| download | ffmpeg-d4a6c9404601ccf0b035477699fa2a9b9b1f515a.tar.gz | |
Merge commit '4f373a5111f900af54301907132942f95276285c'
* commit '4f373a5111f900af54301907132942f95276285c':
vfwcap: Unbreak building after c201069fa
Conflicts:
libavdevice/vfwcap.c
See: 4d0f6d3fb421b3ab774ccd3c299f0a242f359a75
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/vfwcap.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c index 167c40bc85..10e6c69dcb 100644 --- a/libavdevice/vfwcap.c +++ b/libavdevice/vfwcap.c @@ -26,7 +26,10 @@ #include "libavformat/internal.h" +// windows.h must no be included before winsock2.h, and libavformat internal +// headers may include winsock2.h #include <windows.h> +// windows.h needs to be included before vfw.h #include <vfw.h> #include "avdevice.h" |