From 40e6575aa3eed64cd32bf28c00ae57edc5acb25a Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sun, 12 Jun 2022 05:51:12 +0200 Subject: all: Replace if (ARCH_FOO) checks by #if ARCH_FOO This is more spec-compliant because it does not rely on dead-code elimination by the compiler. Especially MSVC has problems with this, as can be seen in https://ffmpeg.org/pipermail/ffmpeg-devel/2022-May/296373.html or https://ffmpeg.org/pipermail/ffmpeg-devel/2022-May/297022.html This commit does not eliminate every instance where we rely on dead code elimination: It only tackles branching to the initialization of arch-specific dsp code, not e.g. all uses of CONFIG_ and HAVE_ checks. But maybe it is already enough to compile FFmpeg with MSVC with whole-programm-optimizations enabled (if one does not disable too many components). Signed-off-by: Andreas Rheinhardt --- libavcodec/snow_dwt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libavcodec/snow_dwt.c') diff --git a/libavcodec/snow_dwt.c b/libavcodec/snow_dwt.c index c093ebff07..e196fefd24 100644 --- a/libavcodec/snow_dwt.c +++ b/libavcodec/snow_dwt.c @@ -853,8 +853,9 @@ av_cold void ff_dwt_init(SnowDWTContext *c) c->horizontal_compose97i = snow_horizontal_compose97i; c->inner_add_yblock = ff_snow_inner_add_yblock; - if (HAVE_MMX) - ff_dwt_init_x86(c); +#if ARCH_X86 && HAVE_MMX + ff_dwt_init_x86(c); +#endif } -- cgit v1.2.3