xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-02-01 01:33:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '4f373a5111f900af54301907132942f95276285c'

Browse Source 
* commit '4f373a5111f900af54301907132942f95276285c':
  vfwcap: Unbreak building after c201069fa

Conflicts:
	libavdevice/vfwcap.c

See: 4d0f6d3fb421b3ab774ccd3c299f0a242f359a75
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-11 01:35:16 +02:00
commit d4a6c94046
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavdevice/vfwcap.c
View File

@ -26,7 +26,10 @@
#include "libavformat/internal.h" #include "libavformat/internal.h"
// windows.h must no be included before winsock2.h, and libavformat internal
// headers may include winsock2.h
#include <windows.h> #include <windows.h>
// windows.h needs to be included before vfw.h
#include <vfw.h> #include <vfw.h>
#include "avdevice.h" #include "avdevice.h"