diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-15 00:02:00 +0300 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-15 00:02:00 +0300 |
commit | b66a94ab539cbebf8dc6ca53d81dfa47d6dd59ac (patch) | |
tree | 7eca566216c54ee427f80203c7b11cc648131dd5 /libavcodec/dxva2_vc1.c | |
parent | 0e4528b88e10e3550dd778ac56a1da9d0a136928 (diff) | |
parent | 08377f9c3bf6dbe216512a2e05c9fac837b13fc0 (diff) |
Merge commit '08377f9c3bf6dbe216512a2e05c9fac837b13fc0'
* commit '08377f9c3bf6dbe216512a2e05c9fac837b13fc0':
dxva: Include last the internal header
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/dxva2_vc1.c')
-rw-r--r-- | libavcodec/dxva2_vc1.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c index 1eb425383e..7cbbc7ef75 100644 --- a/libavcodec/dxva2_vc1.c +++ b/libavcodec/dxva2_vc1.c @@ -20,11 +20,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dxva2_internal.h" #include "mpegutils.h" #include "vc1.h" #include "vc1data.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" + struct dxva2_picture_context { DXVA_PictureParameters pp; DXVA_SliceInfo si; |