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/me_cmp.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'libavcodec/me_cmp.c') diff --git a/libavcodec/me_cmp.c b/libavcodec/me_cmp.c index 4c1de44eda..4407d0a7e9 100644 --- a/libavcodec/me_cmp.c +++ b/libavcodec/me_cmp.c @@ -1061,16 +1061,17 @@ av_cold void ff_me_cmp_init(MECmpContext *c, AVCodecContext *avctx) ff_dsputil_init_dwt(c); #endif - if (ARCH_ALPHA) - ff_me_cmp_init_alpha(c, avctx); - if (ARCH_ARM) - ff_me_cmp_init_arm(c, avctx); - if (ARCH_PPC) - ff_me_cmp_init_ppc(c, avctx); - if (ARCH_X86) - ff_me_cmp_init_x86(c, avctx); - if (ARCH_MIPS) - ff_me_cmp_init_mips(c, avctx); +#if ARCH_ALPHA + ff_me_cmp_init_alpha(c, avctx); +#elif ARCH_ARM + ff_me_cmp_init_arm(c, avctx); +#elif ARCH_PPC + ff_me_cmp_init_ppc(c, avctx); +#elif ARCH_X86 + ff_me_cmp_init_x86(c, avctx); +#elif ARCH_MIPS + ff_me_cmp_init_mips(c, avctx); +#endif c->median_sad[0] = pix_median_abs16_c; c->median_sad[1] = pix_median_abs8_c; -- cgit v1.2.3