[FFmpeg-cvslog] r30334 - trunk/libswscale/swscale.c

[stefano]

Author: stefano
Date: Sat Jan 16 20:51:26 2010
New Revision: 30334

Log:
Revert r30331, which broke compilation.

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

Modified:
   trunk/libswscale/swscale.c

Modified: trunk/libswscale/swscale.c
==============================================================================
--- trunk/libswscale/swscale.c	Sat Jan 16 20:32:58 2010	(r30333)
+++ trunk/libswscale/swscale.c	Sat Jan 16 20:51:26 2010	(r30334)
@@ -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,