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/huffyuvencdsp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libavcodec/huffyuvencdsp.c') diff --git a/libavcodec/huffyuvencdsp.c b/libavcodec/huffyuvencdsp.c index 427d118be4..ea1ef911b0 100644 --- a/libavcodec/huffyuvencdsp.c +++ b/libavcodec/huffyuvencdsp.c @@ -73,6 +73,7 @@ av_cold void ff_huffyuvencdsp_init(HuffYUVEncDSPContext *c, AVCodecContext *avct c->diff_int16 = diff_int16_c; c->sub_hfyu_median_pred_int16 = sub_hfyu_median_pred_int16_c; - if (ARCH_X86) - ff_huffyuvencdsp_init_x86(c, avctx); +#if ARCH_X86 + ff_huffyuvencdsp_init_x86(c, avctx); +#endif } -- cgit v1.2.1