Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2015-10-14 00:20:33 +0300
committerLuca Barbato <lu_zero@gentoo.org>2015-10-14 15:35:34 +0300
commit08377f9c3bf6dbe216512a2e05c9fac837b13fc0 (patch)
tree32f4bff43d2c9aa33d6a0197b3e7d1c6b95a6389 /libavcodec/dxva2_hevc.c
parentc1348506697377b46f844339c178332e3314149a (diff)
dxva: Include last the internal header
It redefines _WIN32_WINNT, possibly causing problems with the w32pthreads.h header.
Diffstat (limited to 'libavcodec/dxva2_hevc.c')
-rw-r--r--libavcodec/dxva2_hevc.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/dxva2_hevc.c b/libavcodec/dxva2_hevc.c
index 88d47823b8..aa684bba75 100644
--- a/libavcodec/dxva2_hevc.c
+++ b/libavcodec/dxva2_hevc.c
@@ -22,9 +22,13 @@
#include "libavutil/avassert.h"
-#include "dxva2_internal.h"
#include "hevc.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"
+
#define MAX_SLICES 256
struct hevc_dxva2_picture_context {