[MPlayer-cvslog] r27393 - in trunk/libmpeg2: libmpeg-0.4.1.diff motion_comp.c

[diego]

Author: diego
Date: Sat Aug  2 01:15:36 2008
New Revision: 27393

Log:
Fix ARM linking failure when IWMMXT support is disabled.
patch by Siarhei Siamashka, siarhei.siamashka gmail com


Modified:
   trunk/libmpeg2/libmpeg-0.4.1.diff
   trunk/libmpeg2/motion_comp.c

Modified: trunk/libmpeg2/libmpeg-0.4.1.diff
==============================================================================
--- trunk/libmpeg2/libmpeg-0.4.1.diff	(original)
+++ trunk/libmpeg2/libmpeg-0.4.1.diff	Sat Aug  2 01:15:36 2008
@@ -194,14 +194,17 @@
      if (accel & MPEG2_ACCEL_PPC_ALTIVEC)
  	mpeg2_mc = mpeg2_mc_altivec;
      else
-@@ -67,6 +61,13 @@
+@@ -61,6 +61,16 @@
  	mpeg2_mc = mpeg2_mc_vis;
      else
  #endif
 +#ifdef ARCH_ARM
++#ifdef HAVE_IWMMXT
 +    if (accel & MPEG2_ACCEL_ARM_IWMMXT)
 +	mpeg2_mc = mpeg2_mc_iwmmxt;
-+    else if (accel & MPEG2_ACCEL_ARM)
++    else
++#endif
++    if (accel & MPEG2_ACCEL_ARM)
 +	mpeg2_mc = mpeg2_mc_arm;
 +    else
 +#endif

Modified: trunk/libmpeg2/motion_comp.c
==============================================================================
--- trunk/libmpeg2/motion_comp.c	(original)
+++ trunk/libmpeg2/motion_comp.c	Sat Aug  2 01:15:36 2008
@@ -62,9 +62,12 @@ void mpeg2_mc_init (uint32_t accel)
     else
 #endif
 #ifdef ARCH_ARM
+#ifdef HAVE_IWMMXT
     if (accel & MPEG2_ACCEL_ARM_IWMMXT)
 	mpeg2_mc = mpeg2_mc_iwmmxt;
-    else if (accel & MPEG2_ACCEL_ARM)
+    else
+#endif
+    if (accel & MPEG2_ACCEL_ARM)
 	mpeg2_mc = mpeg2_mc_arm;
     else
 #endif