On Thu, 5 Apr 2018, Diego Biurrun wrote:
---
libavcodec/dxva2_h264.c | 6 +-----
libavcodec/dxva2_hevc.c | 6 +-----
libavcodec/dxva2_mpeg2.c | 7 ++-----
libavcodec/dxva2_vc1.c | 6 +-----
libavutil/hwcontext_d3d11va.c | 9 +--------
libavutil/hwcontext_dxva2.c | 4 ----
6 files changed, 6 insertions(+), 32 deletions(-)
diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c
index 50e7863bf2..790e4a214b 100644
--- a/libavcodec/dxva2_h264.c
+++ b/libavcodec/dxva2_h264.c
@@ -20,16 +20,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "dxva2_internal.h"
#include "h264dec.h"
#include "h264data.h"
#include "h264_ps.h"
#include "mpegutils.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"
Well technically, this hasn't changed - dxva2_internal.h includes dxva2.h
which still redefines _WIN32_WINNT.
It just sets it to 0x0602, while the lowest it'll be here from before is
0x0600 and the difference shouldn't matter for e.g. w32threads.h.
The patch probably is fine though, but reading the patch made me grep the
source to see what the actual case was.
// Martin
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
