summaryrefslogtreecommitdiff
path: root/libpostproc
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-11-01 18:34:40 +0000
committerDiego Biurrun <diego@biurrun.de>2006-11-01 18:34:40 +0000
commit3cd52279c98910972371723c0654facfe3a1b2d1 (patch)
treec1610e5942ad850464d7faee1136252aa47f49e8 /libpostproc
parenta63e5f1cced5c5fe65845c89bbd5ff798b7b9542 (diff)
downloadffmpeg-3cd52279c98910972371723c0654facfe3a1b2d1.tar.gz
Use common define for x86_32 and x86_64.
Originally committed as revision 6859 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libpostproc')
-rw-r--r--libpostproc/postprocess.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
index a81cf20db1..c9f2893e3c 100644
--- a/libpostproc/postprocess.c
+++ b/libpostproc/postprocess.c
@@ -105,7 +105,7 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks
#define TEMP_STRIDE 8
//#define NUM_BLOCKS_AT_ONCE 16 //not used yet
-#if defined(ARCH_X86) || defined(ARCH_X86_64)
+#if defined(ARCH_X86)
static uint64_t __attribute__((aligned(8))) attribute_used w05= 0x0005000500050005LL;
static uint64_t __attribute__((aligned(8))) attribute_used w04= 0x0004000400040004LL;
static uint64_t __attribute__((aligned(8))) attribute_used w20= 0x0020002000200020LL;
@@ -156,7 +156,7 @@ static const char *replaceTable[]=
};
-#if defined(ARCH_X86) || defined(ARCH_X86_64)
+#if defined(ARCH_X86)
static inline void prefetchnta(void *p)
{
asm volatile( "prefetchnta (%0)\n\t"
@@ -581,7 +581,7 @@ static always_inline void do_a_deblock_C(uint8_t *src, int step, int stride, PPC
#endif //HAVE_ALTIVEC
#endif //ARCH_POWERPC
-#if defined(ARCH_X86) || defined(ARCH_X86_64)
+#if defined(ARCH_X86)
#if (defined (HAVE_MMX) && !defined (HAVE_3DNOW) && !defined (HAVE_MMX2)) || defined (RUNTIME_CPUDETECT)
#define COMPILE_MMX
@@ -594,7 +594,7 @@ static always_inline void do_a_deblock_C(uint8_t *src, int step, int stride, PPC
#if (defined (HAVE_3DNOW) && !defined (HAVE_MMX2)) || defined (RUNTIME_CPUDETECT)
#define COMPILE_3DNOW
#endif
-#endif /* defined(ARCH_X86) || defined(ARCH_X86_64) */
+#endif /* defined(ARCH_X86) */
#undef HAVE_MMX
#undef HAVE_MMX2
@@ -662,7 +662,7 @@ static inline void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int
// difference wouldnt be messureable here but its much better because
// someone might exchange the cpu whithout restarting mplayer ;)
#ifdef RUNTIME_CPUDETECT
-#if defined(ARCH_X86) || defined(ARCH_X86_64)
+#if defined(ARCH_X86)
// ordered per speed fasterst first
if(c->cpuCaps & PP_CPU_CAPS_MMX2)
postProcess_MMX2(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);