diff options
| -rw-r--r-- | libavdevice/dshow_capture.h | 1 | ||||
| -rw-r--r-- | libavdevice/opengl_enc.c | 1 | ||||
| -rw-r--r-- | libavformat/matroskadec.c | 13 | ||||
| -rw-r--r-- | libavutil/atomic_win32.h | 1 |
4 files changed, 10 insertions, 6 deletions
diff --git a/libavdevice/dshow_capture.h b/libavdevice/dshow_capture.h index e4b4dce3fa..0252070284 100644 --- a/libavdevice/dshow_capture.h +++ b/libavdevice/dshow_capture.h @@ -27,6 +27,7 @@ #include "avdevice.h" #define COBJMACROS +#define WIN32_LEAN_AND_MEAN #include <windows.h> #define NO_DSHOW_STRSAFE #include <dshow.h> diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c index 5f5b800569..434ae97a42 100644 --- a/libavdevice/opengl_enc.c +++ b/libavdevice/opengl_enc.c @@ -31,6 +31,7 @@ #include "config.h" #if HAVE_WINDOWS_H +#define WIN32_LEAN_AND_MEAN #include <windows.h> #endif #if HAVE_OPENGL_GL3_H 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, diff --git a/libavutil/atomic_win32.h b/libavutil/atomic_win32.h index 20b99df378..f7299336f6 100644 --- a/libavutil/atomic_win32.h +++ b/libavutil/atomic_win32.h @@ -21,6 +21,7 @@ #ifndef AVUTIL_ATOMIC_WIN32_H #define AVUTIL_ATOMIC_WIN32_H +#define WIN32_LEAN_AND_MEAN #include <windows.h> #define avpriv_atomic_int_get atomic_int_get_win32 |