Commit 43b1e2e6 authored by diego's avatar diego

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


git-svn-id: file:///var/local/repositories/mplayer/trunk/libswscale@30954 b3059339-0415-0410-9bf9-f77b7e298cf2
parent 50630933
...@@ -1262,7 +1262,7 @@ SwsFunc ff_getSwsFunc(SwsContext *c) ...@@ -1262,7 +1262,7 @@ SwsFunc ff_getSwsFunc(SwsContext *c)
} }
#else #else
#if ARCH_PPC && defined(COMPILE_ALTIVEC) #ifdef COMPILE_ALTIVEC
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;
......
...@@ -739,7 +739,7 @@ int sws_setColorspaceDetails(SwsContext *c, const int inv_table[4], int srcRange ...@@ -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); ff_yuv2rgb_c_init_tables(c, inv_table, srcRange, brightness, contrast, saturation);
//FIXME factorize //FIXME factorize
#if ARCH_PPC && HAVE_ALTIVEC #if HAVE_ALTIVEC
if (c->flags & SWS_CPU_CAPS_ALTIVEC) if (c->flags & SWS_CPU_CAPS_ALTIVEC)
ff_yuv2rgb_init_tables_altivec(c, inv_table, brightness, contrast, saturation); ff_yuv2rgb_init_tables_altivec(c, inv_table, brightness, contrast, saturation);
#endif #endif
...@@ -1021,7 +1021,7 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, ...@@ -1021,7 +1021,7 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat,
srcFilter->chrV, dstFilter->chrV, c->param) < 0) srcFilter->chrV, dstFilter->chrV, c->param) < 0)
goto fail; 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->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); 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) ...@@ -1530,7 +1530,7 @@ void sws_freeContext(SwsContext *c)
av_freep(&c->vChrFilter); av_freep(&c->vChrFilter);
av_freep(&c->hLumFilter); av_freep(&c->hLumFilter);
av_freep(&c->hChrFilter); av_freep(&c->hChrFilter);
#if ARCH_PPC && HAVE_ALTIVEC #if HAVE_ALTIVEC
av_freep(&c->vYCoeffsBank); av_freep(&c->vYCoeffsBank);
av_freep(&c->vCCoeffsBank); av_freep(&c->vCCoeffsBank);
#endif #endif
......
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