diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-06-12 06:51:12 +0300 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-06-15 05:56:37 +0300 |
| commit | 40e6575aa3eed64cd32bf28c00ae57edc5acb25a (patch) | |
| tree | 3bc6e3ebca1972cf51f04e30f227e46ff204ec05 /libavcodec/mpegaudiodsp.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/mpegaudiodsp.c')
| -rw-r--r-- | libavcodec/mpegaudiodsp.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/libavcodec/mpegaudiodsp.c b/libavcodec/mpegaudiodsp.c index f03e244644..5a5a679d91 100644 --- a/libavcodec/mpegaudiodsp.c +++ b/libavcodec/mpegaudiodsp.c @@ -74,8 +74,9 @@ static av_cold void mpadsp_init_tabs(void) } } - if (ARCH_X86) - ff_mpadsp_init_x86_tabs(); +#if ARCH_X86 + ff_mpadsp_init_x86_tabs(); +#endif } av_cold void ff_mpadsp_init(MPADSPContext *s) @@ -94,10 +95,19 @@ av_cold void ff_mpadsp_init(MPADSPContext *s) s->imdct36_blocks_float = ff_imdct36_blocks_float; s->imdct36_blocks_fixed = ff_imdct36_blocks_fixed; - if (ARCH_AARCH64) ff_mpadsp_init_aarch64(s); - if (ARCH_ARM) ff_mpadsp_init_arm(s); - if (ARCH_PPC) ff_mpadsp_init_ppc(s); - if (ARCH_X86) ff_mpadsp_init_x86(s); - if (HAVE_MIPSFPU) ff_mpadsp_init_mipsfpu(s); - if (HAVE_MIPSDSP) ff_mpadsp_init_mipsdsp(s); +#if ARCH_AARCH64 + ff_mpadsp_init_aarch64(s); +#elif ARCH_ARM + ff_mpadsp_init_arm(s); +#elif ARCH_PPC + ff_mpadsp_init_ppc(s); +#elif ARCH_X86 + ff_mpadsp_init_x86(s); +#endif +#if HAVE_MIPSFPU + ff_mpadsp_init_mipsfpu(s); +#endif +#if HAVE_MIPSDSP + ff_mpadsp_init_mipsdsp(s); +#endif } |