Merge commit '4f373a5111f900af54301907132942f95276285c'

* commit '4f373a5111f900af54301907132942f95276285c': vfwcap: Unbreak building after c201069fa Conflicts: libavdevice/vfwcap.c See: 4d0f6d3fb4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · d4a6c94046
parent 9fc45681e0 4f373a5111
commit d4a6c94046
1 changed files with 3 additions and 0 deletions
--- 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"