diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2015-10-13 23:20:33 +0200 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2015-10-14 14:35:34 +0200 |
commit | 08377f9c3bf6dbe216512a2e05c9fac837b13fc0 (patch) | |
tree | 32f4bff43d2c9aa33d6a0197b3e7d1c6b95a6389 /libavcodec/dxva2_hevc.c | |
parent | c1348506697377b46f844339c178332e3314149a (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.c | 6 |
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 { |