diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-14 23:02:00 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-14 23:02:00 +0200 |
| commit | b66a94ab539cbebf8dc6ca53d81dfa47d6dd59ac (patch) | |
| tree | 7eca566216c54ee427f80203c7b11cc648131dd5 /libavcodec/dxva2_mpeg2.c | |
| parent | 0e4528b88e10e3550dd778ac56a1da9d0a136928 (diff) | |
| parent | 08377f9c3bf6dbe216512a2e05c9fac837b13fc0 (diff) | |
| download | ffmpeg-b66a94ab539cbebf8dc6ca53d81dfa47d6dd59ac.tar.gz | |
Merge commit '08377f9c3bf6dbe216512a2e05c9fac837b13fc0'
* commit '08377f9c3bf6dbe216512a2e05c9fac837b13fc0':
dxva: Include last the internal header
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
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 64fa196ca6..c2f0b58bee 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; |