Mercurial > mplayer.hg

changeset 27361:7cf315c4707f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix ARM linking failure when IWMMXT support is disabled. patch by Siarhei Siamashka, siarhei.siamashka gmail com
author diego
date Fri, 01 Aug 2008 23:15:36 +0000
parents 4787919c418a
children 9020d4c7bd32
files libmpeg2/libmpeg-0.4.1.diff libmpeg2/motion_comp.c
diffstat 2 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line 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
--- 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