diff options
| author | James Almer <jamrial@gmail.com> | 2018-04-13 20:59:12 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-04-13 20:59:12 -0300 |
| commit | b14761d1f8372dfe558193b8b754b9f1a858077d (patch) | |
| tree | d684f56f3c741f0b500179e432f64a1f6e13d5c4 /libavcodec/dxva2_mpeg2.c | |
| parent | 217ad40aef9eeeff4e805dec3e980fb16aec3345 (diff) | |
| parent | 8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce (diff) | |
| download | ffmpeg-b14761d1f8372dfe558193b8b754b9f1a858077d.tar.gz | |
Merge commit '8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce'
* commit '8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce':
Drop Windows XP support remnants
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/dxva2_mpeg2.c')
| -rw-r--r-- | libavcodec/dxva2_mpeg2.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libavcodec/dxva2_mpeg2.c b/libavcodec/dxva2_mpeg2.c index a57778b427..8cc21bf199 100644 --- a/libavcodec/dxva2_mpeg2.c +++ b/libavcodec/dxva2_mpeg2.c @@ -21,13 +21,10 @@ */ #include "libavutil/log.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" +#include "mpegutils.h" +#include "mpegvideo.h" #define MAX_SLICES 1024 struct dxva2_picture_context { |