Commit 77c3908d authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'd75b5563'

* commit 'd75b5563':
  dxva2/d3d11va: Set _WIN32_WINNT to 0x0602 instead of 0x0600
Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parents 9f543e01 d75b5563
...@@ -5109,7 +5109,7 @@ check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss ...@@ -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 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 "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" check_type "vdpau/vdpau.h" "VdpPictureInfoHEVC"
......
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
* Public libavcodec D3D11VA header. * Public libavcodec D3D11VA header.
*/ */
#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600 #if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0602
#undef _WIN32_WINNT #undef _WIN32_WINNT
#define _WIN32_WINNT 0x0600 #define _WIN32_WINNT 0x0602
#endif #endif
#include <stdint.h> #include <stdint.h>
......
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
* Public libavcodec DXVA2 header. * Public libavcodec DXVA2 header.
*/ */
#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600 #if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0602
#undef _WIN32_WINNT #undef _WIN32_WINNT
#define _WIN32_WINNT 0x0600 #define _WIN32_WINNT 0x0602
#endif #endif
#include <stdint.h> #include <stdint.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment