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/pngdsp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libavcodec/pngdsp.c') diff --git a/libavcodec/pngdsp.c b/libavcodec/pngdsp.c index f450a4c5ee..65916b1386 100644 --- a/libavcodec/pngdsp.c +++ b/libavcodec/pngdsp.c @@ -45,6 +45,7 @@ av_cold void ff_pngdsp_init(PNGDSPContext *dsp) dsp->add_bytes_l2 = add_bytes_l2_c; dsp->add_paeth_prediction = ff_add_png_paeth_prediction; - if (ARCH_X86) - ff_pngdsp_init_x86(dsp); +#if ARCH_X86 + ff_pngdsp_init_x86(dsp); +#endif } -- cgit v1.2.3