virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Revert r30331, which broke compilation.

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

Originally committed as revision 30334 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
This commit is contained in:
Stefano Sabatini 2010-01-16 19:51:26 +00:00
parent 73cadb4f13
commit 730cb9dab3
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libswscale/swscale.c
View File

@ -1863,14 +1863,23 @@ static SwsFunc getSwsFunc(SwsContext *c)
} else if (flags & SWS_CPU_CAPS_MMX) { } else if (flags & SWS_CPU_CAPS_MMX) {
sws_init_swScale_MMX(c); sws_init_swScale_MMX(c);
return swScale_MMX; return swScale_MMX;
} else {
sws_init_swScale_C(c);
return swScale_C;
} }
#else #else
#if ARCH_PPC #if ARCH_PPC
if (flags & SWS_CPU_CAPS_ALTIVEC) { if (flags & SWS_CPU_CAPS_ALTIVEC) {
sws_init_swScale_altivec(c); sws_init_swScale_altivec(c);
return swScale_altivec; return swScale_altivec;
} else {
sws_init_swScale_C(c);
return swScale_C;
} }
#endif #endif
sws_init_swScale_C(c);
return swScale_C;
#endif /* ARCH_X86 && CONFIG_GPL */ #endif /* ARCH_X86 && CONFIG_GPL */
#else //CONFIG_RUNTIME_CPUDETECT #else //CONFIG_RUNTIME_CPUDETECT
#if COMPILE_TEMPLATE_MMX2 #if COMPILE_TEMPLATE_MMX2
@ -1885,11 +1894,11 @@ static SwsFunc getSwsFunc(SwsContext *c)
#elif COMPILE_TEMPLATE_ALTIVEC #elif COMPILE_TEMPLATE_ALTIVEC
sws_init_swScale_altivec(c); sws_init_swScale_altivec(c);
return swScale_altivec; return swScale_altivec;
#endif #else
#endif //!CONFIG_RUNTIME_CPUDETECT
sws_init_swScale_C(c); sws_init_swScale_C(c);
return swScale_C; return swScale_C;
#endif
#endif //!CONFIG_RUNTIME_CPUDETECT
} }
static int PlanarToNV12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int PlanarToNV12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,