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

[stefano]

Author: stefano
Date: Sat Jan 16 20:19:54 2010
New Revision: 30331

Log:
Factorize the code which calls the non optimized C functions in
getSwsFunc().

Modified:
   trunk/libswscale/swscale.c

Modified: trunk/libswscale/swscale.c
==============================================================================
--- trunk/libswscale/swscale.c	Sat Jan 16 20:14:29 2010	(r30330)
+++ trunk/libswscale/swscale.c	Sat Jan 16 20:19:54 2010	(r30331)
@@ -1863,23 +1863,14 @@ 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
@@ -1894,11 +1885,11 @@ static SwsFunc getSwsFunc(SwsContext *c)
 #elif COMPILE_TEMPLATE_ALTIVEC
     sws_init_swScale_altivec(c);
     return swScale_altivec;
-#else
-    sws_init_swScale_C(c);
-    return swScale_C;
 #endif
 #endif //!CONFIG_RUNTIME_CPUDETECT
+
+    sws_init_swScale_C(c);
+    return swScale_C;
 }
 
 static int PlanarToNV12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,