# HG changeset patch # User diego # Date 1269385154 0 # Node ID f91ad62a2281048ab1d9b368f3c69ddbc63557b7 # Parent 4790fe65b11a19d1486be1e292a0d530ce025aa1 AltiVec implies a PPC CPU, so there is no need to check for both. diff -r 4790fe65b11a -r f91ad62a2281 libswscale/swscale.c --- a/libswscale/swscale.c Tue Mar 23 20:24:14 2010 +0000 +++ b/libswscale/swscale.c Tue Mar 23 22:59:14 2010 +0000 @@ -1262,7 +1262,7 @@ } #else -#if ARCH_PPC && defined(COMPILE_ALTIVEC) +#ifdef COMPILE_ALTIVEC if (flags & SWS_CPU_CAPS_ALTIVEC) { sws_init_swScale_altivec(c); return swScale_altivec; diff -r 4790fe65b11a -r f91ad62a2281 libswscale/utils.c --- a/libswscale/utils.c Tue Mar 23 20:24:14 2010 +0000 +++ b/libswscale/utils.c Tue Mar 23 22:59:14 2010 +0000 @@ -739,7 +739,7 @@ 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 @@ 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 @@ 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