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/x86 | |
| 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/x86')
| -rw-r--r-- | libavcodec/x86/mdct15_init.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/x86/mdct15_init.c b/libavcodec/x86/mdct15_init.c index 31ce19d31c..ea7301e1e7 100644 --- a/libavcodec/x86/mdct15_init.c +++ b/libavcodec/x86/mdct15_init.c @@ -89,13 +89,15 @@ av_cold void ff_mdct15_init_x86(MDCT15Context *s) if (EXTERNAL_SSE3(cpu_flags)) s->postreindex = ff_mdct15_postreindex_sse3; - if (ARCH_X86_64 && EXTERNAL_AVX(cpu_flags)) { +#if ARCH_X86_64 + if (EXTERNAL_AVX(cpu_flags)) { s->fft15 = ff_fft15_avx; adjust_twiddles = 1; } - if (ARCH_X86_64 && EXTERNAL_AVX2_FAST(cpu_flags)) + if (EXTERNAL_AVX2_FAST(cpu_flags)) s->postreindex = ff_mdct15_postreindex_avx2; +#endif if (adjust_twiddles) perm_twiddles(s); |