summaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-03-23 20:12:52 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-03-23 20:12:52 +0000
commit5b7bffa71326e9b98da710c7f4f5e7a9523e8814 (patch)
treeed5302db5ad6d00d5f046debc34d6a5a569093a8 /libswscale
parentf76e1414025bacbd038ad68901e86df0f31d1767 (diff)
downloadmpv-5b7bffa71326e9b98da710c7f4f5e7a9523e8814.tar.bz2
mpv-5b7bffa71326e9b98da710c7f4f5e7a9523e8814.tar.xz
Do not compile AltiVec code when AltiVec is not available; not even in
runtime cpudetection mode. Fixes compilation with '--enable-runtime-cpudetect --disable-altivec'. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30952 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/utils.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 91c89c02b0..03a9622aa7 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 || CONFIG_RUNTIME_CPUDETECT)
+#if ARCH_PPC && 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 || CONFIG_RUNTIME_CPUDETECT)
+#if ARCH_PPC && 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 || CONFIG_RUNTIME_CPUDETECT)
+#if ARCH_PPC && HAVE_ALTIVEC
av_freep(&c->vYCoeffsBank);
av_freep(&c->vCCoeffsBank);
#endif