X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fdxva2_vc1.c;h=7cbbc7ef75376e7ab696e8f98ca4c68fbc3b96cd;hb=de1b1a7da9e6ddf42447271e519099a88b389e4a;hp=1eb425383e296ba6f55eafab7c413688ed6043f4;hpb=d0186a4ec4c4391906bf7dcd83d3ea3e3b858d82;p=ffmpeg

diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c
index 1eb425383e2..7cbbc7ef753 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;