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/aacsbr_template.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libavcodec/aacsbr_template.c') diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c index 774f12e77a..db9b9becbb 100644 --- a/libavcodec/aacsbr_template.c +++ b/libavcodec/aacsbr_template.c @@ -1573,7 +1573,8 @@ static void aacsbr_func_ptr_init(AACSBRContext *c) c->sbr_hf_inverse_filter = sbr_hf_inverse_filter; #if !USE_FIXED - if(ARCH_MIPS) - ff_aacsbr_func_ptr_init_mips(c); +#if ARCH_MIPS + ff_aacsbr_func_ptr_init_mips(c); +#endif #endif } -- cgit v1.2.3