From 25968dbb056a1066296a005e2d24545c28a4fa8c Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sat, 1 Nov 2025 18:41:27 +0100 Subject: [PATCH] avcodec/parser_internal: Rename PASSTHROUGH macro to avoid name conflict wingdi.h defines its own PASSTHROUGH and it is included implicitly by the VC-1 parser (which is mpegvideo-based and therefore includes a lot of stuff). Signed-off-by: Andreas Rheinhardt --- libavcodec/parser_internal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/parser_internal.h b/libavcodec/parser_internal.h index e366b5576a..fa9af971c1 100644 --- a/libavcodec/parser_internal.h +++ b/libavcodec/parser_internal.h @@ -67,9 +67,9 @@ static inline const FFCodecParser *ffcodecparser(const AVCodecParser *parser) #define CHECK_FOR_TOO_MANY_IDS(...) AV_JOIN(EIGTH_ARG(__VA_ARGS__, NO, NO, NO, NO, NO, NO, NO, NO), _FAIL) // For compatibility with MSVC's old, spec-incompliant preprocessor. -#define PASSTHROUGH(...) __VA_ARGS__ +#define FF_MSVC_EXPAND(...) __VA_ARGS__ #define FIRST_SEVEN2(a,b,c,d,e,f,g,...) a,b,c,d,e,f,g -#define FIRST_SEVEN(...) PASSTHROUGH(FIRST_SEVEN2(__VA_ARGS__)) +#define FIRST_SEVEN(...) FF_MSVC_EXPAND(FIRST_SEVEN2(__VA_ARGS__)) #define TIMES_SEVEN(a) a,a,a,a,a,a,a #if FF_API_PARSER_PRIVATE