summaryrefslogtreecommitdiff
path: root/libswscale/rgb2rgb.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-08-11 12:50:14 +0000
committerDiego Biurrun <diego@biurrun.de>2006-08-11 12:50:14 +0000
commit49a0122c99dcbdf2960ea36e10ded5d608d2e287 (patch)
tree03f33b44314c57d06b2e2d57b462a4cde71bf701 /libswscale/rgb2rgb.c
parent2211d62097863b4b9479dc9007e62d2b79e57824 (diff)
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
Diffstat (limited to 'libswscale/rgb2rgb.c')
-rw-r--r--libswscale/rgb2rgb.c4
1 files changed, 1 insertions, 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;