AltiVec implies a PPC CPU, so there is no need to check for both.

Originally committed as revision 30954 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
This commit is contained in:
Diego Biurrun 2010-03-23 22:59:14 +00:00
parent 13bc1ac31a
commit f684f3c58a
2 changed files with 4 additions and 4 deletions

View File

@ -1262,7 +1262,7 @@ SwsFunc ff_getSwsFunc(SwsContext *c)
}
#else
#if ARCH_PPC && defined(COMPILE_ALTIVEC)
#ifdef COMPILE_ALTIVEC
if (flags & SWS_CPU_CAPS_ALTIVEC) {
sws_init_swScale_altivec(c);
return swScale_altivec;

View File

@ -739,7 +739,7 @@ int sws_setColorspaceDetails(SwsContext *c, const int inv_table[4], int srcRange
ff_yuv2rgb_c_init_tables(c, inv_table, srcRange, brightness, contrast, saturation);
//FIXME factorize
#if ARCH_PPC && HAVE_ALTIVEC
#if HAVE_ALTIVEC
if (c->flags & SWS_CPU_CAPS_ALTIVEC)
ff_yuv2rgb_init_tables_altivec(c, inv_table, brightness, contrast, saturation);
#endif
@ -1021,7 +1021,7 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat,
srcFilter->chrV, dstFilter->chrV, c->param) < 0)
goto fail;
#if ARCH_PPC && HAVE_ALTIVEC
#if HAVE_ALTIVEC
FF_ALLOC_OR_GOTO(c, c->vYCoeffsBank, sizeof (vector signed short)*c->vLumFilterSize*c->dstH, fail);
FF_ALLOC_OR_GOTO(c, c->vCCoeffsBank, sizeof (vector signed short)*c->vChrFilterSize*c->chrDstH, fail);
@ -1530,7 +1530,7 @@ void sws_freeContext(SwsContext *c)
av_freep(&c->vChrFilter);
av_freep(&c->hLumFilter);
av_freep(&c->hChrFilter);
#if ARCH_PPC && HAVE_ALTIVEC
#if HAVE_ALTIVEC
av_freep(&c->vYCoeffsBank);
av_freep(&c->vCCoeffsBank);
#endif