diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-21 13:05:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-22 01:37:14 +0100 |
| commit | b16bf913d8edacc368913fdaa92a23ae7d18d193 (patch) | |
| tree | f3a8fc715399ce5dd1a9b0d3384474ea18fff223 /libavcodec | |
| parent | 29436c1ab2c59ff779e6bf45e89aaf820110c140 (diff) | |
dxva2: move _WIN32_WINNT handling to public header
This removes duplicate code
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dxva2.h | 7 | ||||
| -rw-r--r-- | libavcodec/dxva2_internal.h | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/libavcodec/dxva2.h b/libavcodec/dxva2.h index 9620eda802..ac39e06917 100644 --- a/libavcodec/dxva2.h +++ b/libavcodec/dxva2.h @@ -29,7 +29,14 @@ * Public libavcodec DXVA2 header. */ +#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600 +#undef _WIN32_WINNT +#endif + +#if !defined(_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 dd1c7ae6be..8a454c1299 100644 --- a/libavcodec/dxva2_internal.h +++ b/libavcodec/dxva2_internal.h @@ -23,14 +23,6 @@ #ifndef AVCODEC_DXVA_INTERNAL_H #define AVCODEC_DXVA_INTERNAL_H -#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600 -#undef _WIN32_WINNT -#endif - -#if !defined(_WIN32_WINNT) -#define _WIN32_WINNT 0x0600 -#endif - #define COBJMACROS #include "config.h" |