From 4f373a5111f900af54301907132942f95276285c Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Fri, 10 Apr 2015 12:22:33 +0300 Subject: vfwcap: Unbreak building after c201069fa MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These headers can't be included in any arbitrary order. Signed-off-by: Martin Storsjö --- libavdevice/vfwcap.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'libavdevice') diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c index 4182642ce9..5e2ba844ef 100644 --- a/libavdevice/vfwcap.c +++ b/libavdevice/vfwcap.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include - #include "libavutil/internal.h" #include "libavutil/log.h" #include "libavutil/opt.h" @@ -30,6 +27,12 @@ #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 needs to be included before vfw.h +#include + /* Some obsolete versions of MinGW32 before 4.0.0 lack this. */ #ifndef HWND_MESSAGE #define HWND_MESSAGE ((HWND) -3) -- cgit v1.2.3