--- xvid.c	2003/01/04 06:14:32	1.33.2.22
+++ xvid.c	2003/02/16 05:11:39	1.42
@@ -37,7 +37,7 @@
  *  - 22.12.2001  API change: added xvid_init() - Isibaar
  *  - 16.12.2001	inital version; (c)2001 peter ross <pross@cs.rmit.edu.au>
  *
- *  $Id: xvid.c,v 1.33.2.22 2003/01/04 06:14:32 suxen_drol Exp $
+ *  $Id: xvid.c,v 1.42 2003/02/16 05:11:39 suxen_drol Exp $
  *
  ****************************************************************************/
 
@@ -65,7 +65,7 @@
 #include "utils/timer.h"
 #include "bitstream/mbcoding.h"
 
-#if defined(ARCH_X86)
+#if defined(ARCH_IS_IA32)
 
 #if defined(_MSC_VER)
 #	include <windows.h>
@@ -136,7 +136,7 @@
 	/* enable native assembly optimizations by default */
 	unsigned int cpu_flags = XVID_CPU_ASM;
 
-#if defined(ARCH_X86)
+#if defined(ARCH_IS_IA32)
 	cpu_flags |= check_cpu_features();
 	if ((cpu_flags & XVID_CPU_SSE) && sigill_check(sse_os_trigger))
 		cpu_flags &= ~XVID_CPU_SSE;
@@ -145,8 +145,8 @@
 		cpu_flags &= ~XVID_CPU_SSE2;
 #endif
 
-#if defined(ARCH_PPC)
-#if defined(ARCH_PPC_ALTIVEC)
+#if defined(ARCH_IS_PPC)
+#if defined(ARCH_IS_PPC_ALTIVEC)
 	cpu_flags |= XVID_CPU_ALTIVEC;
 #endif
 #endif
@@ -229,6 +229,7 @@
 	transfer_8to16copy = transfer_8to16copy_c;
 	transfer_16to8copy = transfer_16to8copy_c;
 	transfer_8to16sub  = transfer_8to16sub_c;
+	transfer_8to16subro  = transfer_8to16subro_c;
 	transfer_8to16sub2 = transfer_8to16sub2_c;
 	transfer_16to8add  = transfer_16to8add_c;
 	transfer8x8_copy   = transfer8x8_copy_c;
@@ -317,7 +318,7 @@
 	
 //	Halfpel8_Refine = Halfpel8_Refine_c;
 
-#if defined(ARCH_X86)
+#if defined(ARCH_IS_IA32)
 
 	if ((cpu_flags & XVID_CPU_ASM))
 	{
@@ -354,6 +355,7 @@
 		transfer_8to16copy = transfer_8to16copy_mmx;
 		transfer_16to8copy = transfer_16to8copy_mmx;
 		transfer_8to16sub  = transfer_8to16sub_mmx;
+		transfer_8to16subro  = transfer_8to16subro_mmx;
 		transfer_8to16sub2 = transfer_8to16sub2_mmx;
 		transfer_16to8add  = transfer_16to8add_mmx;
 		transfer8x8_copy   = transfer8x8_copy_mmx;
@@ -474,6 +476,7 @@
 		transfer_8to16copy =  transfer_8to16copy_3dne;
 		transfer_16to8copy = transfer_16to8copy_3dne;
 		transfer_8to16sub =  transfer_8to16sub_3dne;
+		transfer_8to16subro =  transfer_8to16subro_3dne;
 		transfer_8to16sub2 =  transfer_8to16sub2_3dne;
 		transfer_16to8add = transfer_16to8add_3dne;
 		transfer8x8_copy = transfer8x8_copy_3dne;
@@ -522,7 +525,7 @@
 	}
 #endif
 
-#if defined(ARCH_IA64)
+#if defined(ARCH_IS_IA64)
 	if ((cpu_flags & XVID_CPU_ASM)) { //use assembler routines?
 	  idct_ia64_init();
 	  fdct = fdct_ia64;
@@ -549,7 +552,7 @@
 	}
 #endif 
 
-#if defined(ARCH_PPC)
+#if defined(ARCH_IS_PPC)
 	if ((cpu_flags & XVID_CPU_ASM))
 	{
 		calc_cbp = calc_cbp_ppc;
@@ -661,7 +664,7 @@
 #define TEST_FDCT  (TEST_FORWARD)
 #define TEST_IDCT  (0)
 
-int test_transform(void * funcA, void * funcB, const char * nameB,
+static int test_transform(void * funcA, void * funcB, const char * nameB,
 				   int test, int flags)
 {
 	int i;
@@ -741,7 +744,7 @@
 #define TEST_DEQUANT_INTRA	(TEST_INTRA)
 #define TEST_DEQUANT_INTER	(0)
 
-int test_quant(void * funcA, void * funcB, const char * nameB,
+static int test_quant(void * funcA, void * funcB, const char * nameB,
 			   int test, int flags)
 {
 	int q,i;
@@ -828,7 +831,7 @@
 
 	printf("xvid_init_test\n");
 
-#if defined(ARCH_X86)		
+#if defined(ARCH_IS_IA32)		
 	cpu_flags = detect_cpu_flags();
 	idct_int32_init();
 	emms_mmx();