From 721d5e3b9511c0e0f5e1c29050c4976297c0ef24 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 27 Sep 2007 08:00:22 +0000 Subject: [PATCH] Revert wrong ARCH_BFIN --> HAVE_BFIN change. Originally committed as revision 24627 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale --- libswscale/swscale.c | 2 +- libswscale/swscale_internal.h | 2 +- libswscale/yuv2rgb.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 8e061daea5..8f3670ef18 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -2045,7 +2045,7 @@ SwsContext *sws_getContext(int srcW, int srcH, int srcFormat, int dstW, int dstH flags |= SWS_CPU_CAPS_MMX; #elif defined (HAVE_ALTIVEC) flags |= SWS_CPU_CAPS_ALTIVEC; -#elif defined (HAVE_BFIN) +#elif defined (ARCH_BFIN) flags |= SWS_CPU_CAPS_BFIN; #endif #endif /* RUNTIME_CPUDETECT */ diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 62cfcf5185..b5d4ed7a50 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -157,7 +157,7 @@ typedef struct SwsContext{ #endif -#ifdef HAVE_BFIN +#ifdef ARCH_BFIN uint32_t oy __attribute__((aligned(4))); uint32_t oc __attribute__((aligned(4))); uint32_t zero __attribute__((aligned(4))); diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c index 507ad58db8..065c0e8ae8 100644 --- a/libswscale/yuv2rgb.c +++ b/libswscale/yuv2rgb.c @@ -654,7 +654,7 @@ SwsFunc yuv2rgb_get_func_ptr (SwsContext *c) } #endif -#ifdef HAVE_BFIN +#ifdef ARCH_BFIN if (c->flags & SWS_CPU_CAPS_BFIN) { SwsFunc t = ff_bfin_yuv2rgb_get_func_ptr (c); -- 2.11.0