summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2013-02-08 01:17:06 -0300
committerMichael Niedermayer <michaelni@gmx.at>2013-02-08 14:10:19 +0100
commit89946c8403752fbb26234d98f780188df8951a2e (patch)
treeeb5f2c427c0205f5674fc371320895227b6389b4
parent47335126c049a5d2468b1b8b328c286a0d978159 (diff)
downloadffmpeg-89946c8403752fbb26234d98f780188df8951a2e.tar.gz
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>
-rw-r--r--libavcodec/dxva2_internal.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h
index fcf45bc664..03f7f5dad4 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"