diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-28 22:22:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-28 22:22:10 +0200 |
| commit | 77c3908d5cd076d343554d0f73360a00b5fc90ab (patch) | |
| tree | ba6bb57f0c94d46e08c2e5ba0552b6ad70267f3d | |
| parent | 9f543e01afe38996f409b4bf85ef738cda118006 (diff) | |
| parent | d75b55635a02444c2f188c26e431a1cec992babe (diff) | |
| download | ffmpeg-77c3908d5cd076d343554d0f73360a00b5fc90ab.tar.gz | |
Merge commit 'd75b55635a02444c2f188c26e431a1cec992babe'
* commit 'd75b55635a02444c2f188c26e431a1cec992babe':
dxva2/d3d11va: Set _WIN32_WINNT to 0x0602 instead of 0x0600
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/d3d11va.h | 4 | ||||
| -rw-r--r-- | libavcodec/dxva2.h | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -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" diff --git a/libavcodec/d3d11va.h b/libavcodec/d3d11va.h index d51e2ff8f5..3d810f5379 100644 --- a/libavcodec/d3d11va.h +++ b/libavcodec/d3d11va.h @@ -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> diff --git a/libavcodec/dxva2.h b/libavcodec/dxva2.h index be246d7198..9e3ab86a82 100644 --- a/libavcodec/dxva2.h +++ b/libavcodec/dxva2.h @@ -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> |