[Mplayer-cvslog] CVS: main/libmpeg2 motion_comp.c,1.8,1.9

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/libmpeg2
In directory mail:/var2/tmp/cvs-serv24088/libmpeg2

Modified Files:
	motion_comp.c 
Log Message:
#ifdef simplification and higher consistency


Index: motion_comp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/motion_comp.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- motion_comp.c	14 Aug 2004 15:17:39 -0000	1.8
+++ motion_comp.c	30 Aug 2004 00:42:27 -0000	1.9
@@ -42,25 +42,21 @@
 	mpeg2_mc = mpeg2_mc_mmx;
     else
 #endif
-#ifdef ARCH_PPC
-#ifdef HAVE_ALTIVEC
+#if defined(ARCH_PPC) && defined(HAVE_ALTIVEC)
     if (accel & MPEG2_ACCEL_PPC_ALTIVEC)
 	mpeg2_mc = mpeg2_mc_altivec;
     else
 #endif
-#endif
 #ifdef ARCH_ALPHA
     if (accel & MPEG2_ACCEL_ALPHA)
 	mpeg2_mc = mpeg2_mc_alpha;
     else
 #endif
-#ifdef ARCH_SPARC
-#ifdef HAVE_VIS
+#if defined(ARCH_SPARC) && defined(HAVE_VIS)
     if (accel & MPEG2_ACCEL_SPARC_VIS)
 	mpeg2_mc = mpeg2_mc_vis;
     else
 #endif
-#endif
 	mpeg2_mc = mpeg2_mc_c;
 }