summaryrefslogtreecommitdiff
path: root/libavcodec/dxva2_vp9.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2018-04-13 20:59:12 -0300
committerJames Almer <jamrial@gmail.com>2018-04-13 20:59:12 -0300
commitb14761d1f8372dfe558193b8b754b9f1a858077d (patch)
treed684f56f3c741f0b500179e432f64a1f6e13d5c4 /libavcodec/dxva2_vp9.c
parent217ad40aef9eeeff4e805dec3e980fb16aec3345 (diff)
parent8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce (diff)
Merge commit '8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce'
* commit '8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce': Drop Windows XP support remnants Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/dxva2_vp9.c')
-rw-r--r--libavcodec/dxva2_vp9.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/dxva2_vp9.c b/libavcodec/dxva2_vp9.c
index 5a5b226422..eaeab3af7a 100644
--- a/libavcodec/dxva2_vp9.c
+++ b/libavcodec/dxva2_vp9.c
@@ -23,12 +23,8 @@
#include "libavutil/avassert.h"
#include "libavutil/pixdesc.h"
-#include "vp9shared.h"
-
-// The headers above may include w32threads.h, which uses the original
-// _WIN32_WINNT define, while dxva2_internal.h redefines it to target a
-// potentially newer version.
#include "dxva2_internal.h"
+#include "vp9shared.h"
struct vp9_dxva2_picture_context {
DXVA_PicParams_VP9 pp;