diff options
author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-06-12 05:51:12 +0200 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-06-15 04:56:37 +0200 |
commit | 40e6575aa3eed64cd32bf28c00ae57edc5acb25a (patch) | |
tree | 3bc6e3ebca1972cf51f04e30f227e46ff204ec05 /libavcodec/fmtconvert.c | |
parent | e5f6707a7b91664491041526ef3cce7412258b89 (diff) |
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 <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/fmtconvert.c')
-rw-r--r-- | libavcodec/fmtconvert.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/libavcodec/fmtconvert.c b/libavcodec/fmtconvert.c index 3e1f133bf1..fd56a63c77 100644 --- a/libavcodec/fmtconvert.c +++ b/libavcodec/fmtconvert.c @@ -56,14 +56,16 @@ av_cold void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx) c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_c; c->int32_to_float_fmul_array8 = int32_to_float_fmul_array8_c; - if (ARCH_AARCH64) - ff_fmt_convert_init_aarch64(c, avctx); - if (ARCH_ARM) - ff_fmt_convert_init_arm(c, avctx); - if (ARCH_PPC) - ff_fmt_convert_init_ppc(c, avctx); - if (ARCH_X86) - ff_fmt_convert_init_x86(c, avctx); - if (HAVE_MIPSFPU) - ff_fmt_convert_init_mips(c); +#if ARCH_AARCH64 + ff_fmt_convert_init_aarch64(c, avctx); +#elif ARCH_ARM + ff_fmt_convert_init_arm(c, avctx); +#elif ARCH_PPC + ff_fmt_convert_init_ppc(c, avctx); +#elif ARCH_X86 + ff_fmt_convert_init_x86(c, avctx); +#endif +#if HAVE_MIPSFPU + ff_fmt_convert_init_mips(c); +#endif } |