From 49a0122c99dcbdf2960ea36e10ded5d608d2e287 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 11 Aug 2006 12:50:14 +0000 Subject: [PATCH] Fix compilation with MMX disabled, the mmx_null and mmx_one constants don't need to be protected by HAVE_MMX. Originally committed as revision 19367 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale --- libswscale/rgb2rgb.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c index 29b6e5e989..aef779755d 100644 --- a/libswscale/rgb2rgb.c +++ b/libswscale/rgb2rgb.c @@ -72,11 +72,9 @@ void (*yvu9_to_yuy2)(const uint8_t *src1, const uint8_t *src2, const uint8_t *sr long srcStride1, long srcStride2, long srcStride3, long dstStride); -#if defined(HAVE_MMX) +#if defined(ARCH_X86) || defined(ARCH_X86_64) static const uint64_t mmx_null __attribute__((aligned(8))) = 0x0000000000000000ULL; static const uint64_t mmx_one __attribute__((aligned(8))) = 0xFFFFFFFFFFFFFFFFULL; -#endif -#if defined(ARCH_X86) || defined(ARCH_X86_64) static const uint64_t mask32b attribute_used __attribute__((aligned(8))) = 0x000000FF000000FFULL; static const uint64_t mask32g attribute_used __attribute__((aligned(8))) = 0x0000FF000000FF00ULL; static const uint64_t mask32r attribute_used __attribute__((aligned(8))) = 0x00FF000000FF0000ULL;