From 68544d15da70e99724f6e7df43ab2d74d4750b66 Mon Sep 17 00:00:00 2001
From: stefano <stefano@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 16 Jan 2010 19:51:26 +0000
Subject: Revert r30331, which broke compilation.

swScale_C is not templated if any optimization is to be used and
!runtime_cpudetect.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30334 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libswscale/swscale.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 3f01e003ba..bb274e6f57 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -1863,14 +1863,23 @@ static SwsFunc getSwsFunc(SwsContext *c)
     } else if (flags & SWS_CPU_CAPS_MMX) {
         sws_init_swScale_MMX(c);
         return swScale_MMX;
+    } else {
+        sws_init_swScale_C(c);
+        return swScale_C;
     }
+
 #else
 #if ARCH_PPC
     if (flags & SWS_CPU_CAPS_ALTIVEC) {
         sws_init_swScale_altivec(c);
         return swScale_altivec;
+    } else {
+        sws_init_swScale_C(c);
+        return swScale_C;
     }
 #endif
+    sws_init_swScale_C(c);
+    return swScale_C;
 #endif /* ARCH_X86 && CONFIG_GPL */
 #else //CONFIG_RUNTIME_CPUDETECT
 #if   COMPILE_TEMPLATE_MMX2
@@ -1885,11 +1894,11 @@ static SwsFunc getSwsFunc(SwsContext *c)
 #elif COMPILE_TEMPLATE_ALTIVEC
     sws_init_swScale_altivec(c);
     return swScale_altivec;
-#endif
-#endif //!CONFIG_RUNTIME_CPUDETECT
-
+#else
     sws_init_swScale_C(c);
     return swScale_C;
+#endif
+#endif //!CONFIG_RUNTIME_CPUDETECT
 }
 
 static int PlanarToNV12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-- 
cgit v1.2.3