vfwcap: Unbreak building after c201069fa
authorMartin Storsjö <martin@martin.st>
Fri, 10 Apr 2015 09:22:33 +0000 (12:22 +0300)
committerMartin Storsjö <martin@martin.st>
Fri, 10 Apr 2015 21:15:47 +0000 (00:15 +0300)
These headers can't be included in any arbitrary order.

Signed-off-by: Martin Storsjö <martin@martin.st>
libavdevice/vfwcap.c

index 4182642..5e2ba84 100644 (file)
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <vfw.h>
-#include <windows.h>
-
 #include "libavutil/internal.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
 #include "libavformat/avformat.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>
+// windows.h needs to be included before vfw.h
+#include <vfw.h>
+
 /* Some obsolete versions of MinGW32 before 4.0.0 lack this. */
 #ifndef HWND_MESSAGE
 #define HWND_MESSAGE ((HWND) -3)