diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-01-16 19:19:54 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-01-16 19:19:54 +0000 |
| commit | 80853cfc6a184f8a78bc1da8d479d960cdbb7074 (patch) | |
| tree | d8170cf639c3754ee6354ca491dd15a7ae3a6ba5 /libswscale/swscale.c | |
| parent | c70f1401dfd29be1d0d7fbf5a87e532344350ae7 (diff) | |
| download | ffmpeg-80853cfc6a184f8a78bc1da8d479d960cdbb7074.tar.gz | |
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
Diffstat (limited to 'libswscale/swscale.c')
| -rw-r--r-- | libswscale/swscale.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index bb274e6f57..3f01e003ba 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, |