diff options
| author | James Almer <jamrial@gmail.com> | 2018-04-13 20:59:12 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-04-13 20:59:12 -0300 |
| commit | b14761d1f8372dfe558193b8b754b9f1a858077d (patch) | |
| tree | d684f56f3c741f0b500179e432f64a1f6e13d5c4 /libavutil | |
| parent | 217ad40aef9eeeff4e805dec3e980fb16aec3345 (diff) | |
| parent | 8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce (diff) | |
| download | ffmpeg-b14761d1f8372dfe558193b8b754b9f1a858077d.tar.gz | |
Merge commit '8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce'
* commit '8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce':
Drop Windows XP support remnants
Merged-by: James Almer <jamrial@gmail.com>
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 d39fdd3fc8..b68d262804 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 665c2d6d74..4585f323bb 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 |