--- mem_transfer.h	2005/01/05 23:02:15	1.16
+++ mem_transfer.h	2008/11/26 01:04:34	1.18
@@ -19,7 +19,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: mem_transfer.h,v 1.16 2005/01/05 23:02:15 edgomez Exp $
+ * $Id: mem_transfer.h,v 1.18 2008/11/26 01:04:34 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -42,7 +42,7 @@
 /* Implemented functions */
 extern TRANSFER_8TO16COPY transfer_8to16copy_c;
 
-#ifdef ARCH_IS_IA32
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 extern TRANSFER_8TO16COPY transfer_8to16copy_mmx;
 extern TRANSFER_8TO16COPY transfer_8to16copy_3dne;
 #endif
@@ -55,10 +55,6 @@
 extern TRANSFER_8TO16COPY transfer_8to16copy_altivec_c;
 #endif
 
-#ifdef ARCH_IS_X86_64
-extern TRANSFER_8TO16COPY transfer_8to16copy_x86_64;
-#endif
-
 /*****************************************************************************
  * transfer16to8 API
  ****************************************************************************/
@@ -74,7 +70,7 @@
 /* Implemented functions */
 extern TRANSFER_16TO8COPY transfer_16to8copy_c;
 
-#ifdef ARCH_IS_IA32
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 extern TRANSFER_16TO8COPY transfer_16to8copy_mmx;
 extern TRANSFER_16TO8COPY transfer_16to8copy_3dne;
 #endif
@@ -108,7 +104,7 @@
 /* Implemented functions */
 extern TRANSFER_8TO16SUB transfer_8to16sub_c;
 
-#ifdef ARCH_IS_IA32
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 extern TRANSFER_8TO16SUB transfer_8to16sub_mmx;
 extern TRANSFER_8TO16SUB transfer_8to16sub_3dne;
 #endif
@@ -142,7 +138,7 @@
 /* Implemented functions */
 extern TRANSFER_8TO16SUBRO transfer_8to16subro_c;
 
-#ifdef ARCH_IS_IA32
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 extern TRANSFER_8TO16SUBRO transfer_8to16subro_mmx;
 extern TRANSFER_8TO16SUBRO transfer_8to16subro_3dne;
 #endif
@@ -173,7 +169,7 @@
 /* Implemented functions */
 TRANSFER_8TO16SUB2 transfer_8to16sub2_c;
 
-#ifdef ARCH_IS_IA32
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 extern TRANSFER_8TO16SUB2 transfer_8to16sub2_mmx;
 extern TRANSFER_8TO16SUB2 transfer_8to16sub2_xmm;
 extern TRANSFER_8TO16SUB2 transfer_8to16sub2_3dne;
@@ -209,7 +205,7 @@
 /* Implemented functions */
 TRANSFER_8TO16SUB2RO transfer_8to16sub2ro_c;
 
-#ifdef ARCH_IS_IA32
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 extern TRANSFER_8TO16SUB2RO transfer_8to16sub2ro_xmm;
 #endif
 
@@ -233,7 +229,7 @@
 /* Implemented functions */
 extern TRANSFER_16TO8ADD transfer_16to8add_c;
 
-#ifdef ARCH_IS_IA32
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 extern TRANSFER_16TO8ADD transfer_16to8add_mmx;
 extern TRANSFER_16TO8ADD transfer_16to8add_3dne;
 #endif
@@ -266,7 +262,7 @@
 /* Implemented functions */
 extern TRANSFER8X8_COPY transfer8x8_copy_c;
 
-#ifdef ARCH_IS_IA32
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 extern TRANSFER8X8_COPY transfer8x8_copy_mmx;
 extern TRANSFER8X8_COPY transfer8x8_copy_3dne;
 #endif
@@ -283,6 +279,28 @@
 extern TRANSFER8X8_COPY transfer8x8_copy_x86_64;
 #endif
 
+/*****************************************************************************
+ * transfer8to4 + no op
+ ****************************************************************************/
+
+typedef void (TRANSFER8X4_COPY) (uint8_t * const dst,
+								 const uint8_t * const src,
+								 const uint32_t stride);
+
+typedef TRANSFER8X4_COPY *TRANSFER8X4_COPY_PTR;
+
+/* Our global function pointer - Initialized in xvid.c */
+extern TRANSFER8X4_COPY_PTR transfer8x4_copy;
+
+/* Implemented functions */
+extern TRANSFER8X4_COPY transfer8x4_copy_c;
+
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
+extern TRANSFER8X4_COPY transfer8x4_copy_mmx;
+extern TRANSFER8X4_COPY transfer8x4_copy_3dne;
+#endif
+
+
 static __inline void
 transfer16x16_copy(uint8_t * const dst,
 					const uint8_t * const src,