Commit 4f373a51 authored by Martin Storsjö's avatar Martin Storsjö
Browse files

vfwcap: Unbreak building after c201069f



These headers can't be included in any arbitrary order.
Signed-off-by: default avatarMartin Storsjö <martin@martin.st>
parent 8d26c193
...@@ -19,9 +19,6 @@ ...@@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <vfw.h>
#include <windows.h>
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
...@@ -30,6 +27,12 @@ ...@@ -30,6 +27,12 @@
#include "libavformat/avformat.h" #include "libavformat/avformat.h"
#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>
// windows.h needs to be included before vfw.h
#include <vfw.h>
/* Some obsolete versions of MinGW32 before 4.0.0 lack this. */ /* Some obsolete versions of MinGW32 before 4.0.0 lack this. */
#ifndef HWND_MESSAGE #ifndef HWND_MESSAGE
#define HWND_MESSAGE ((HWND) -3) #define HWND_MESSAGE ((HWND) -3)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment