diff options
| author | Martin Storsjö <martin@martin.st> | 2015-04-10 12:22:33 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2015-04-11 00:15:47 +0300 |
| commit | 4f373a5111f900af54301907132942f95276285c (patch) | |
| tree | 765215b2d7a77ce84475f03fab673fdeec829b8a /libavdevice | |
| parent | 8d26c193fb42d08602ac93ece039d4718d029adc (diff) | |
| download | ffmpeg-4f373a5111f900af54301907132942f95276285c.tar.gz | |
vfwcap: Unbreak building after c201069fa
These headers can't be included in any arbitrary order.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/vfwcap.c | 9 |
1 files changed, 6 insertions, 3 deletions
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 <vfw.h> -#include <windows.h> - #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> +// 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) |