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 /libswscale/swscale_unscaled.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 'libswscale/swscale_unscaled.c')
-rw-r--r-- | libswscale/swscale_unscaled.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 7cb2a62f07..8838cc8b53 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -2222,12 +2222,13 @@ void ff_get_unscaled_swscale(SwsContext *c) c->convert_unscaled = planarCopyWrapper; } - if (ARCH_PPC) - ff_get_unscaled_swscale_ppc(c); - if (ARCH_ARM) - ff_get_unscaled_swscale_arm(c); - if (ARCH_AARCH64) - ff_get_unscaled_swscale_aarch64(c); +#if ARCH_PPC + ff_get_unscaled_swscale_ppc(c); +#elif ARCH_ARM + ff_get_unscaled_swscale_arm(c); +#elif ARCH_AARCH64 + ff_get_unscaled_swscale_aarch64(c); +#endif } /* Convert the palette to the same packed 32-bit format as the palette */ |