diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-03-23 22:59:14 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-03-23 22:59:14 +0000 |
| commit | 1b58868670d4d2d4ded9ec70ea56a30fe1f600d7 (patch) | |
| tree | 8a5763ced9a5f5757b10ae868694a4c96ab64a39 | |
| parent | 983b920137dc9139d0026e87821e241035a24b90 (diff) | |
| download | mpv-1b58868670d4d2d4ded9ec70ea56a30fe1f600d7.tar.bz2 mpv-1b58868670d4d2d4ded9ec70ea56a30fe1f600d7.tar.xz | |
AltiVec implies a PPC CPU, so there is no need to check for both.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30954 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libswscale/swscale.c | 2 | ||||
| -rw-r--r-- | libswscale/utils.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 1d255bcb39..e297ef4f58 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -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; diff --git a/libswscale/utils.c b/libswscale/utils.c index 03a9622aa7..804c01a71a 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -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 |