summaryrefslogtreecommitdiff
path: root/libswscale/rgb2rgb.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-06-12 05:51:12 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-06-15 04:56:37 +0200
commit40e6575aa3eed64cd32bf28c00ae57edc5acb25a (patch)
tree3bc6e3ebca1972cf51f04e30f227e46ff204ec05 /libswscale/rgb2rgb.c
parente5f6707a7b91664491041526ef3cce7412258b89 (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 'libswscale/rgb2rgb.c')
-rw-r--r--libswscale/rgb2rgb.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c
index a7300f3ba4..b8be76913b 100644
--- a/libswscale/rgb2rgb.c
+++ b/libswscale/rgb2rgb.c
@@ -137,10 +137,11 @@ void (*yuyvtoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
av_cold void ff_sws_rgb2rgb_init(void)
{
rgb2rgb_init_c();
- if (ARCH_AARCH64)
- rgb2rgb_init_aarch64();
- if (ARCH_X86)
- rgb2rgb_init_x86();
+#if ARCH_AARCH64
+ rgb2rgb_init_aarch64();
+#elif ARCH_X86
+ rgb2rgb_init_x86();
+#endif
}
void rgb32to24(const uint8_t *src, uint8_t *dst, int src_size)