Merge commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Sep 2014 18:42:50 +0000 (20:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Sep 2014 18:45:50 +0000 (20:45 +0200)
* commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae':
  dxva2: Clean up definition of _WIN32_WINNT

Conflicts:
libavcodec/dxva2.h

See: 89946c8403752fbb26234d98f780188df8951a2e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dxva2.h

index 2639d89..be246d7 100644 (file)
  * 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