From 89946c8403752fbb26234d98f780188df8951a2e Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Fri, 8 Feb 2013 01:17:06 -0300
Subject: dxva2: Prevent redefinition of _WIN32_WINNT

Don't redefine _WIN32_WINNT when targeting Win7/8

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
 libavcodec/dxva2_internal.h | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'libavcodec')

diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h
index fcf45bc..03f7f5d 100644
--- a/libavcodec/dxva2_internal.h
+++ b/libavcodec/dxva2_internal.h
@@ -23,7 +23,14 @@
 #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"
-- 
cgit v1.1