From 38b59aa1a9afb0730f31d8618e2dfdee7eb19ba4 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sat, 21 Nov 2020 11:12:40 -0600 Subject: [PATCH] Fix DXVA2 renderer compilation with Qt 6.0 --- app/streaming/video/ffmpeg-renderers/dxva2.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/streaming/video/ffmpeg-renderers/dxva2.cpp b/app/streaming/video/ffmpeg-renderers/dxva2.cpp index 5dc5bb2e..8824dd80 100644 --- a/app/streaming/video/ffmpeg-renderers/dxva2.cpp +++ b/app/streaming/video/ffmpeg-renderers/dxva2.cpp @@ -1,3 +1,7 @@ +// minwindef.h defines min() and max() macros that conflict with +// std::numeric_limits, which Qt uses in some of its headers. +#define NOMINMAX + #include #include "dxva2.h" #include "../ffmpeg.h"