From 08b84558a2144a8729100f788ca0fe6318b61c76 Mon Sep 17 00:00:00 2001 From: cudawarped <12133430+cudawarped@users.noreply.github.com> Date: Wed, 10 Sep 2025 08:00:41 +0300 Subject: [PATCH] Move preprocessor directives outside of macro to avoid the following error when compiling with MSVC D:\repos\opencv\opencv\modules\videoio\src\cap_ffmpeg_impl.hpp(1727): error C2121: '#': invalid character: possibly the result of a macro expansion D:\repos\opencv\opencv\modules\videoio\src\cap_ffmpeg_impl.hpp(1727): error C2143: syntax error: missing ';' before 'if' D:\repos\opencv\opencv\modules\videoio\src\cap_ffmpeg_impl.hpp(1727): error C2059: syntax error: '>=' --- modules/videoio/src/cap_ffmpeg_impl.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp index ed1d99bdb0..7ce18fdfbf 100644 --- a/modules/videoio/src/cap_ffmpeg_impl.hpp +++ b/modules/videoio/src/cap_ffmpeg_impl.hpp @@ -1724,12 +1724,13 @@ bool CvCapture_FFMPEG::retrieveFrame(int flag, unsigned char** data, int* step, if (!sw_picture || !sw_picture->data[0]) return false; - CV_LOG_DEBUG(NULL, "Input picture format: " << av_get_pix_fmt_name((AVPixelFormat)sw_picture->format) << ", colorspace: " #if LIBAVUTIL_BUILD >= CALC_FFMPEG_VERSION(56, 72, 0) - << av_color_space_name(sw_picture->colorspace) + const char* color_space_name = av_color_space_name(sw_picture->colorspace); #else - << av_get_colorspace_name(sw_picture->colorspace) + const char* color_space_name = av_get_colorspace_name(sw_picture->colorspace); #endif + CV_LOG_DEBUG(NULL, "Input picture format: " << av_get_pix_fmt_name((AVPixelFormat)sw_picture->format) + << ", colorspace: " << color_space_name << ", range: " << av_color_range_name(sw_picture->color_range) << ", primaries: " << av_color_primaries_name(sw_picture->color_primaries) << ", transfer: " << av_color_transfer_name(sw_picture->color_trc)