# HG changeset patch # User stefano # Date 1263669594 0 # Node ID 2961ce981a2b475222e45d0a03fe6f4f2dc0548e # Parent 4ee0cedb32f297c11a2a8779bcd8dac3be54690f Factorize the code which calls the non optimized C functions in getSwsFunc(). diff -r 4ee0cedb32f2 -r 2961ce981a2b libswscale/swscale.c --- a/libswscale/swscale.c Sat Jan 16 19:14:29 2010 +0000 +++ b/libswscale/swscale.c Sat Jan 16 19:19:54 2010 +0000 @@ -1863,23 +1863,14 @@ } 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 @@ #elif COMPILE_TEMPLATE_ALTIVEC sws_init_swScale_altivec(c); return swScale_altivec; -#else +#endif +#endif //!CONFIG_RUNTIME_CPUDETECT + 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,