Browse Source

Merge commit 'd75b55635a02444c2f188c26e431a1cec992babe'

* commit 'd75b55635a02444c2f188c26e431a1cec992babe':
  dxva2/d3d11va: Set _WIN32_WINNT to 0x0602 instead of 0x0600

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n2.8
Michael Niedermayer 10 years ago
parent
commit
77c3908d5c
3 changed files with 5 additions and 5 deletions
  1. +1
    -1
      configure
  2. +2
    -2
      libavcodec/d3d11va.h
  3. +2
    -2
      libavcodec/dxva2.h

+ 1
- 1
configure View File

@@ -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"



+ 2
- 2
libavcodec/d3d11va.h View 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>


+ 2
- 2
libavcodec/dxva2.h View 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>


Loading…
Cancel
Save