# HG changeset patch
# User diego
# Date 1217632536 0
# Node ID 7cf315c4707f7fa916b7d92fa8576ab9081152de
# Parent  4787919c418a3dde295b909b55cc3c6b59332d96
Fix ARM linking failure when IWMMXT support is disabled.
patch by Siarhei Siamashka, siarhei.siamashka gmail com

diff -r 4787919c418a -r 7cf315c4707f libmpeg2/libmpeg-0.4.1.diff
--- a/libmpeg2/libmpeg-0.4.1.diff	Fri Aug 01 23:09:45 2008 +0000
+++ b/libmpeg2/libmpeg-0.4.1.diff	Fri Aug 01 23:15:36 2008 +0000
@@ -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
diff -r 4787919c418a -r 7cf315c4707f libmpeg2/motion_comp.c
--- a/libmpeg2/motion_comp.c	Fri Aug 01 23:09:45 2008 +0000
+++ b/libmpeg2/motion_comp.c	Fri Aug 01 23:15:36 2008 +0000
@@ -62,9 +62,12 @@
     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