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/blockdsp.c | |
| parent | e5f6707a7b91664491041526ef3cce7412258b89 (diff) | |
| download | ffmpeg-40e6575aa3eed64cd32bf28c00ae57edc5acb25a.tar.gz | |
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/blockdsp.c')
| -rw-r--r-- | libavcodec/blockdsp.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/libavcodec/blockdsp.c b/libavcodec/blockdsp.c index 5fb242ea65..c8f85dd202 100644 --- a/libavcodec/blockdsp.c +++ b/libavcodec/blockdsp.c @@ -64,14 +64,15 @@ av_cold void ff_blockdsp_init(BlockDSPContext *c, AVCodecContext *avctx) c->fill_block_tab[0] = fill_block16_c; c->fill_block_tab[1] = fill_block8_c; - if (ARCH_ALPHA) - ff_blockdsp_init_alpha(c); - if (ARCH_ARM) - ff_blockdsp_init_arm(c); - if (ARCH_PPC) - ff_blockdsp_init_ppc(c); - if (ARCH_X86) - ff_blockdsp_init_x86(c, avctx); - if (ARCH_MIPS) - ff_blockdsp_init_mips(c); +#if ARCH_ALPHA + ff_blockdsp_init_alpha(c); +#elif ARCH_ARM + ff_blockdsp_init_arm(c); +#elif ARCH_PPC + ff_blockdsp_init_ppc(c); +#elif ARCH_X86 + ff_blockdsp_init_x86(c, avctx); +#elif ARCH_MIPS + ff_blockdsp_init_mips(c); +#endif } |