diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2015-10-14 00:20:33 +0300 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2015-10-14 15:35:34 +0300 |
commit | 08377f9c3bf6dbe216512a2e05c9fac837b13fc0 (patch) | |
tree | 32f4bff43d2c9aa33d6a0197b3e7d1c6b95a6389 /libavcodec/dxva2_mpeg2.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_mpeg2.c')
-rw-r--r-- | libavcodec/dxva2_mpeg2.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/dxva2_mpeg2.c b/libavcodec/dxva2_mpeg2.c index 62308b403e..2d88f9b804 100644 --- a/libavcodec/dxva2_mpeg2.c +++ b/libavcodec/dxva2_mpeg2.c @@ -21,10 +21,14 @@ */ #include "libavutil/log.h" -#include "dxva2_internal.h" #include "mpegutils.h" #include "mpegvideo.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 1024 struct dxva2_picture_context { DXVA_PictureParameters pp; |