From 46caba4a65237c006ab54b0c16ecc00d21dedda1 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Thu, 20 Mar 2014 14:16:25 +0100
Subject: [PATCH] float_dsp: Replace arch optimization ifdefs by if cascade

Arch-specific optimizations are handled this way everywhere else.
---
 libavutil/float_dsp.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/libavutil/float_dsp.c b/libavutil/float_dsp.c
index 6ff7e2f5085..aabc800db64 100644
--- a/libavutil/float_dsp.c
+++ b/libavutil/float_dsp.c
@@ -124,15 +124,14 @@ av_cold void avpriv_float_dsp_init(AVFloatDSPContext *fdsp, int bit_exact)
     fdsp->butterflies_float = butterflies_float_c;
     fdsp->scalarproduct_float = avpriv_scalarproduct_float_c;
 
-#if   ARCH_AARCH64
-    ff_float_dsp_init_aarch64(fdsp);
-#elif ARCH_ARM
-    ff_float_dsp_init_arm(fdsp);
-#elif ARCH_PPC
-    ff_float_dsp_init_ppc(fdsp, bit_exact);
-#elif ARCH_X86
-    ff_float_dsp_init_x86(fdsp);
-#endif
+    if (ARCH_AARCH64)
+        ff_float_dsp_init_aarch64(fdsp);
+    if (ARCH_ARM)
+        ff_float_dsp_init_arm(fdsp);
+    if (ARCH_PPC)
+        ff_float_dsp_init_ppc(fdsp, bit_exact);
+    if (ARCH_X86)
+        ff_float_dsp_init_x86(fdsp);
 }
 
 #ifdef TEST
-- 
GitLab