summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-11 12:50:14 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-11 12:50:14 +0000
commit1ff914c6a9e3b6fa0f5cb0a25a65521a24116a18 (patch)
treeea56cf986d7468acd2bbfbe553c64b2674d64480
parentb85ad74dc94a27a6f0181a0c7a75d08798ec8e1d (diff)
downloadmpv-1ff914c6a9e3b6fa0f5cb0a25a65521a24116a18.tar.bz2
mpv-1ff914c6a9e3b6fa0f5cb0a25a65521a24116a18.tar.xz
Fix compilation with MMX disabled, the mmx_null and mmx_one constants don't need to
be protected by HAVE_MMX. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19367 b3059339-0415-0410-9bf9-f77b7e298cf2
-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;