diff options
| author | Matthew Oliver <protogonoi@gmail.com> | 2014-11-27 19:00:36 +1100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-27 12:40:18 +0100 |
| commit | 0167fa00604443aa20a2fb627081a46f1c0be4ff (patch) | |
| tree | 5221bb560aaa19c26441c9d03a73b16541100d40 /libavformat/matroskadec.c | |
| parent | 22e557917d08ed93e9c657f13c9669482341eb02 (diff) | |
| download | ffmpeg-0167fa00604443aa20a2fb627081a46f1c0be4ff.tar.gz | |
msvc: Fix compilation errors due to header include order.
Ensures that the header include order is such that winsock2.h is always
included before windows.h or that windows.h does not include winsock.h.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 3b45c3b04e..c81b5a04af 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -32,12 +32,6 @@ #include <inttypes.h> #include <stdio.h> -#if CONFIG_BZLIB -#include <bzlib.h> -#endif -#if CONFIG_ZLIB -#include <zlib.h> -#endif #include "libavutil/avstring.h" #include "libavutil/base64.h" @@ -62,6 +56,13 @@ #include "riff.h" #include "rmsipr.h" +#if CONFIG_BZLIB +#include <bzlib.h> +#endif +#if CONFIG_ZLIB +#include <zlib.h> +#endif + typedef enum { EBML_NONE, EBML_UINT, |