diff options
| author | Martin Storsjö <martin@martin.st> | 2015-07-25 20:30:31 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2015-07-28 19:37:47 +0300 |
| commit | d75b55635a02444c2f188c26e431a1cec992babe (patch) | |
| tree | 06ab7b56517829b8630dae8fab37e6fc9c4affcc | |
| parent | b7040e67ec18259ca634a0e29d98469b3484a87c (diff) | |
dxva2/d3d11va: Set _WIN32_WINNT to 0x0602 instead of 0x0600
If _WIN32_WINNT is unset, we force it to a new enough value to
make sure the necessary definitions are visible.
When targeting Windows Phone or Windows RT, _WIN32_WINNT should
be at least 0x0602 - otherwise the windows headers themselves
can cause errors (which technically are bugs in the headers).
Raising this value here shouldn't hurt; the alternative would
be to not touch it at all if WINAPI_FAMILY is set to phone/app,
or to force setting it to 0x0602 in configure if unset (for phone/app).
Signed-off-by: Martin Storsjö <martin@martin.st>
| -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
@@ -4280,7 +4280,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 if ! disabled w32threads && ! enabled pthreads; then check_func_headers "windows.h process.h" _beginthreadex && diff --git a/libavcodec/d3d11va.h b/libavcodec/d3d11va.h index 2163b350aa..f5777c26dd 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 d9017c6b8d..ec448a4c2c 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> |