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>
1  2 
configure
libavcodec/d3d11va.h
libavcodec/dxva2.h

diff --cc configure
+++ b/configure
@@@ -5109,10 -4280,8 +5109,10 @@@ check_struct "sys/time.h sys/resource.h
  
  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"
 +
  if ! disabled w32threads && ! enabled pthreads; then
      check_func_headers "windows.h process.h" _beginthreadex &&
          enable w32threads || disable w32threads
Simple merge
Simple merge