diff options
| author | Diego Biurrun <diego@biurrun.de> | 2018-04-02 01:06:18 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2018-04-09 21:58:39 +0200 |
| commit | 8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce (patch) | |
| tree | 82ea83505f66dd6b38416e64b53dffec7d38ab5a /libavutil | |
| parent | c7ab6aff66cba2f265f656ce8d56aa428d4ada76 (diff) | |
| download | ffmpeg-8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce.tar.gz | |
Drop Windows XP support remnants
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/hwcontext_d3d11va.c | 9 | ||||
| -rw-r--r-- | libavutil/hwcontext_dxva2.c | 4 |
2 files changed, 1 insertions, 12 deletions
diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c index 0a8cc5bc21..6488fc2203 100644 --- a/libavutil/hwcontext_d3d11va.c +++ b/libavutil/hwcontext_d3d11va.c @@ -20,14 +20,6 @@ #include <windows.h> -// Include thread.h before redefining _WIN32_WINNT, to get -// the right implementation for AVOnce -#include "thread.h" - -#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600 -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 -#endif #define COBJMACROS #include <initguid.h> @@ -46,6 +38,7 @@ #include "imgutils.h" #include "pixdesc.h" #include "pixfmt.h" +#include "thread.h" typedef HRESULT(WINAPI *PFN_CREATE_DXGI_FACTORY)(REFIID riid, void **ppFactory); diff --git a/libavutil/hwcontext_dxva2.c b/libavutil/hwcontext_dxva2.c index d1b19ab237..bf9a3a9c11 100644 --- a/libavutil/hwcontext_dxva2.c +++ b/libavutil/hwcontext_dxva2.c @@ -18,10 +18,6 @@ #include <windows.h> -#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600 -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 -#endif #define DXVA2API_USE_BITFIELDS #define COBJMACROS |