From 80853cfc6a184f8a78bc1da8d479d960cdbb7074 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sat, 16 Jan 2010 19:19:54 +0000 Subject: Factorize the code which calls the non optimized C functions in getSwsFunc(). Originally committed as revision 30331 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale --- libswscale/swscale.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'libswscale') diff --git a/libswscale/swscale.c b/libswscale/swscale.c index bb274e6..3f01e00 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -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, -- cgit v1.1