Merge commit 'd75b55635a02444c2f188c26e431a1cec992babe'
authorMichael Niedermayer <michael@niedermayer.cc>
Tue, 28 Jul 2015 20:22:06 +0000 (22:22 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Tue, 28 Jul 2015 20:22:10 +0000 (22:22 +0200)
* commit 'd75b55635a02444c2f188c26e431a1cec992babe':
  dxva2/d3d11va: Set _WIN32_WINNT to 0x0602 instead of 0x0600

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
configure
libavcodec/d3d11va.h
libavcodec/dxva2.h

index bd9d61f67bba36858602c1aa73d5fde39a2f2b6c..c9a92eba7ee3c7df96d131d75778fa92255be896 100755 (executable)
--- a/configure
+++ b/configure
@@ -5109,7 +5109,7 @@ check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
 
 check_type "windows.h dxva.h" "DXVA_PicParams_HEVC" -DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP -D_CRT_BUILD_DESKTOP_APP=0
 check_type "windows.h d3d11.h" "ID3D11VideoDecoder"
-check_type "d3d9.h dxva2api.h" DXVA2_ConfigPictureDecode -D_WIN32_WINNT=0x0600
+check_type "d3d9.h dxva2api.h" DXVA2_ConfigPictureDecode -D_WIN32_WINNT=0x0602
 
 check_type "vdpau/vdpau.h" "VdpPictureInfoHEVC"
 
index d51e2ff8f575ee9905b279361dcfa4c9cacff97a..3d810f537934ce27ab460f890882f0c3ce4cea60 100644 (file)
@@ -30,9 +30,9 @@
  * Public libavcodec D3D11VA header.
  */
 
-#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600
+#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0602
 #undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600
+#define _WIN32_WINNT 0x0602
 #endif
 
 #include <stdint.h>
index be246d71980884912b7f302931b0a85b0bb89e55..9e3ab86a82f261e7365e3252e5bbdf9637a97315 100644 (file)
@@ -29,9 +29,9 @@
  * Public libavcodec DXVA2 header.
  */
 
-#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600
+#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0602
 #undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600
+#define _WIN32_WINNT 0x0602
 #endif
 
 #include <stdint.h>