diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-08-15 21:01:15 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-09-01 12:23:59 +0200 |
| commit | b8962d64cc71af241601bcab5c3fcdc5735ef4ae (patch) | |
| tree | 0164c880dee529756f8aebae857440a19d7a1515 /libavcodec | |
| parent | 4600a85eaa6182e5a27464f6b9cae5a9ddbf3098 (diff) | |
| download | ffmpeg-b8962d64cc71af241601bcab5c3fcdc5735ef4ae.tar.gz | |
dxva2: Clean up definition of _WIN32_WINNT
Only set a value if _WIN32_WINNT is undefined or smaller than 0x0600. This is
cleaner than unconditional definition and avoids a number of redefinition
warnings. Also only define a value in one of the two dxva2 headers.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dxva2.h | 4 | ||||
| -rw-r--r-- | libavcodec/dxva2_internal.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/dxva2.h b/libavcodec/dxva2.h index 78939be961..d9017c6b8d 100644 --- a/libavcodec/dxva2.h +++ b/libavcodec/dxva2.h @@ -29,7 +29,11 @@ * Public libavcodec DXVA2 header. */ +#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600 +#undef _WIN32_WINNT #define _WIN32_WINNT 0x0600 +#endif + #include <stdint.h> #include <d3d9.h> #include <dxva2api.h> diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h index f35a0765ce..b775e6c304 100644 --- a/libavcodec/dxva2_internal.h +++ b/libavcodec/dxva2_internal.h @@ -23,7 +23,6 @@ #ifndef AVCODEC_DXVA_INTERNAL_H #define AVCODEC_DXVA_INTERNAL_H -#define _WIN32_WINNT 0x0600 #define COBJMACROS #include "config.h" |