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 /libswresample/resample_dsp.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 'libswresample/resample_dsp.c')
| -rw-r--r-- | libswresample/resample_dsp.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libswresample/resample_dsp.c b/libswresample/resample_dsp.c index b2424eb6f7..611f44373f 100644 --- a/libswresample/resample_dsp.c +++ b/libswresample/resample_dsp.c @@ -68,7 +68,11 @@ void swri_resample_dsp_init(ResampleContext *c) break; } - if (ARCH_X86) swri_resample_dsp_x86_init(c); - else if (ARCH_ARM) swri_resample_dsp_arm_init(c); - else if (ARCH_AARCH64) swri_resample_dsp_aarch64_init(c); +#if ARCH_X86 + swri_resample_dsp_x86_init(c); +#elif ARCH_ARM + swri_resample_dsp_arm_init(c); +#elif ARCH_AARCH64 + swri_resample_dsp_aarch64_init(c); +#endif } |