diff -Naur main.orig/libmpeg2/cpu_accel.c main/libmpeg2/cpu_accel.c
--- main.orig/libmpeg2/cpu_accel.c	2004-10-02 18:22:30.000000000 +0200
+++ main/libmpeg2/cpu_accel.c	2004-11-02 14:01:27.452217192 +0100
@@ -30,7 +30,7 @@
 #include "mpeg2_internal.h"
 
 #ifdef ACCEL_DETECT
-#ifdef ARCH_X86
+#if defined(ARCH_X86) || defined(ARCH_X86_64)
 static inline uint32_t arch_accel (void)
 {
     uint32_t eax, ebx, ecx, edx;
@@ -106,7 +106,7 @@
 
     return caps;
 }
-#endif /* ARCH_X86 */
+#endif /* ARCH_X86 || ARCH_X86_64 */
 
 #if defined(ARCH_PPC) || (defined(ARCH_SPARC) && defined(HAVE_VIS))
 #include <signal.h>
@@ -216,7 +216,7 @@
 
     accel = 0;
 #ifdef ACCEL_DETECT
-#if defined (ARCH_X86) || defined (ARCH_PPC) || defined (ARCH_ALPHA) || defined (ARCH_SPARC)
+#if defined (ARCH_X86) || defined (ARCH_X86_64) || defined (ARCH_PPC) || defined (ARCH_ALPHA) || defined (ARCH_SPARC)
     accel = arch_accel ();
 #endif
 #endif
diff -Naur main.orig/libmpeg2/cpu_state.c main/libmpeg2/cpu_state.c
--- main.orig/libmpeg2/cpu_state.c	2004-10-02 18:22:30.000000000 +0200
+++ main/libmpeg2/cpu_state.c	2004-11-02 14:01:27.453217040 +0100
@@ -29,14 +29,14 @@
 #include "mpeg2.h"
 #include "attributes.h"
 #include "mpeg2_internal.h"
-#ifdef ARCH_X86
+#if defined(ARCH_X86) || defined(ARCH_X86_64)
 #include "mmx.h"
 #endif
 
 void (* mpeg2_cpu_state_save) (cpu_state_t * state) = NULL;
 void (* mpeg2_cpu_state_restore) (cpu_state_t * state) = NULL;
 
-#ifdef ARCH_X86
+#if defined(ARCH_X86) || defined(ARCH_X86_64)
 static void state_restore_mmx (cpu_state_t * state)
 {
     emms ();
@@ -115,7 +115,7 @@
 
 void mpeg2_cpu_state_init (uint32_t accel)
 {
-#ifdef ARCH_X86
+#if defined(ARCH_X86) || defined(ARCH_X86_64)
     if (accel & MPEG2_ACCEL_X86_MMX) {
 	mpeg2_cpu_state_restore = state_restore_mmx;
     }
diff -Naur main.orig/libmpeg2/idct.c main/libmpeg2/idct.c
--- main.orig/libmpeg2/idct.c	2004-10-02 18:22:30.000000000 +0200
+++ main/libmpeg2/idct.c	2004-11-02 14:01:27.453217040 +0100
@@ -235,7 +235,7 @@
 
 void mpeg2_idct_init (uint32_t accel)
 {
-#ifdef ARCH_X86
+#if defined(ARCH_X86) || defined(ARCH_X86_64)
     if (accel & MPEG2_ACCEL_X86_MMXEXT) {
 	mpeg2_idct_copy = mpeg2_idct_copy_mmxext;
 	mpeg2_idct_add = mpeg2_idct_add_mmxext;
diff -Naur main.orig/libmpeg2/idct_mmx.c main/libmpeg2/idct_mmx.c
--- main.orig/libmpeg2/idct_mmx.c	2004-10-02 18:22:30.000000000 +0200
+++ main/libmpeg2/idct_mmx.c	2004-11-02 14:01:27.453217040 +0100
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#ifdef ARCH_X86
+#if defined(ARCH_X86) || defined(ARCH_X86_64)
 
 #include <inttypes.h>
 
diff -Naur main.orig/libmpeg2/motion_comp.c main/libmpeg2/motion_comp.c
--- main.orig/libmpeg2/motion_comp.c	2004-10-02 18:22:30.000000000 +0200
+++ main/libmpeg2/motion_comp.c	2004-11-02 14:01:27.453217040 +0100
@@ -33,7 +33,7 @@
 
 void mpeg2_mc_init (uint32_t accel)
 {
-#ifdef ARCH_X86
+#if defined(ARCH_X86) || defined(ARCH_X86_64)
     if (accel & MPEG2_ACCEL_X86_MMXEXT)
 	mpeg2_mc = mpeg2_mc_mmxext;
     else if (accel & MPEG2_ACCEL_X86_3DNOW)
diff -Naur main.orig/libmpeg2/motion_comp_mmx.c main/libmpeg2/motion_comp_mmx.c
--- main.orig/libmpeg2/motion_comp_mmx.c	2004-10-02 18:22:30.000000000 +0200
+++ main/libmpeg2/motion_comp_mmx.c	2004-11-02 14:01:27.453217040 +0100
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#ifdef ARCH_X86
+#if defined(ARCH_X86) || defined(ARCH_X86_64)
 
 #include <inttypes.h>