diff options
| author | stefano <stefano@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-16 19:19:54 +0000 |
|---|---|---|
| committer | stefano <stefano@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-16 19:19:54 +0000 |
| commit | 5cd08a9945dbd9f38fdec73266db320a8b0ba587 (patch) | |
| tree | 4daaf6c65e0ef9af1ad9ae19d778643528a5bb4b | |
| parent | 5ffab28a7cb64532b75f4aa93291d96bb0270c0a (diff) | |
| download | mpv-5cd08a9945dbd9f38fdec73266db320a8b0ba587.tar.bz2 mpv-5cd08a9945dbd9f38fdec73266db320a8b0ba587.tar.xz | |
Factorize the code which calls the non optimized C functions in
getSwsFunc().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30331 b3059339-0415-0410-9bf9-f77b7e298cf2
| -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, |