[FFmpeg-devel] [PATCH] dxva2: move _WIN32_WINNT handling to public header

[Michael Niedermayer]

This removes duplicate code

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
---
 libavcodec/dxva2.h          |    7 +++++++
 libavcodec/dxva2_internal.h |    8 --------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/libavcodec/dxva2.h b/libavcodec/dxva2.h
index 9620eda..ac39e06 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 dd1c7ae..8a454c1 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"
-- 
1.7.9.5