Commit 6e1949ac authored by stefano's avatar stefano

Revert r30331, which broke compilation.

swScale_C is not templated if any optimization is to be used and
!runtime_cpudetect.


git-svn-id: file:///var/local/repositories/mplayer/trunk/libswscale@30334 b3059339-0415-0410-9bf9-f77b7e298cf2
parent b2a924e5
......@@ -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,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment