Merge commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae'

* commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae': dxva2: Clean up definition of _WIN32_WINNT Conflicts: libavcodec/dxva2.h See: 89946c8403 Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 38c4316fff
parent 052cd1ce72 b8962d64cc
commit 38c4316fff
1 changed files with 1 additions and 4 deletions
--- a/libavcodec/dxva2.h
+++ b/libavcodec/dxva2.h
@ -29,11 +29,8 @@
 * Public libavcodec DXVA2 header.
 */

-#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600
+#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600
 #undef _WIN32_WINNT
-#endif
-
-#if !defined(_WIN32_WINNT)
 #define _WIN32_WINNT 0x0600
 #endif