diff options
| author |  stefano <stefano@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-16 19:51:26 +0000 |
|---|---|---|
| committer | stefano <stefano@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-16 19:51:26 +0000 |
| commit | 68544d15da70e99724f6e7df43ab2d74d4750b66 (patch) | |
| tree | 6acfbcf7a710e9584d21e53e223582717ecea326 | |
| parent | e1a3ac7fb2af13f4cbe125ac4d4869160704d4bf (diff) | |
Revert r30331, which broke compilation.
swScale_C is not templated if any optimization is to be used and
!runtime_cpudetect.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30334 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libswscale/swscale.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 3f01e003ba..bb274e6f57 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -1863,14 +1863,23 @@ 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 @@ -1885,11 +1894,11 @@ static SwsFunc getSwsFunc(SwsContext *c) #elif COMPILE_TEMPLATE_ALTIVEC sws_init_swScale_altivec(c); return swScale_altivec; -#endif -#endif //!CONFIG_RUNTIME_CPUDETECT - +#else 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, |