Ahem...
Some of the #ifdeffery I submitted is not really functional outside
MPlayer in its current form. libmpeg2 does not set things like
HAVE_ALTIVEC and similar right now, so surrounding code with this
preprocessor conditional effectively disables it.
Here is a patch to revert the changes. Sorry for the troubles. I shall
go stand in a corner with a brown paper bag over my head shortly...
Diego
Index: libmpeg2/cpu_accel.c
===================================================================
--- libmpeg2/cpu_accel.c (revision 1164)
+++ libmpeg2/cpu_accel.c (working copy)
@@ -127,7 +127,7 @@
}
#endif /* ARCH_X86 || ARCH_X86_64 */
-#if defined(ACCEL_DETECT) && (defined(ARCH_PPC) || (defined(ARCH_SPARC) && defined(HAVE_VIS)))
+#if defined(ACCEL_DETECT) && (defined(ARCH_PPC) || defined(ARCH_SPARC))
#include <signal.h>
#include <setjmp.h>
Index: libmpeg2/motion_comp.c
===================================================================
--- libmpeg2/motion_comp.c (revision 1164)
+++ libmpeg2/motion_comp.c (working copy)
@@ -42,7 +42,7 @@
mpeg2_mc = mpeg2_mc_mmx;
else
#endif
-#if defined(ARCH_PPC) && defined(HAVE_ALTIVEC)
+#ifdef ARCH_PPC
if (accel & MPEG2_ACCEL_PPC_ALTIVEC)
mpeg2_mc = mpeg2_mc_altivec;
else
@@ -52,7 +52,7 @@
mpeg2_mc = mpeg2_mc_alpha;
else
#endif
-#if defined(ARCH_SPARC) && defined(HAVE_VIS)
+#ifdef ARCH_SPARC
if (accel & MPEG2_ACCEL_SPARC_VIS)
mpeg2_mc = mpeg2_mc_vis;
else
Index: libmpeg2/idct.c
===================================================================
--- libmpeg2/idct.c (revision 1164)
+++ libmpeg2/idct.c (working copy)
@@ -246,7 +246,7 @@
mpeg2_idct_mmx_init ();
} else
#endif
-#if defined(ARCH_PPC) && defined(HAVE_ALTIVEC)
+#ifdef ARCH_PPC
if (accel & MPEG2_ACCEL_PPC_ALTIVEC) {
mpeg2_idct_copy = mpeg2_idct_copy_altivec;
mpeg2_idct_add = mpeg2_idct_add_altivec;
Index: libmpeg2/cpu_state.c
===================================================================
--- libmpeg2/cpu_state.c (revision 1164)
+++ libmpeg2/cpu_state.c (working copy)
@@ -43,7 +43,7 @@
}
#endif
-#if defined(ARCH_PPC) && defined(HAVE_ALTIVEC)
+#ifdef ARCH_PPC
#if defined(__APPLE_CC__) /* apple */
#define LI(a,b) "li r" #a "," #b "\n\t"
#define STVX0(a,b,c) "stvx v" #a ",0,r" #c "\n\t"
@@ -120,7 +120,7 @@
mpeg2_cpu_state_restore = state_restore_mmx;
}
#endif
-#if defined(ARCH_PPC) && defined(HAVE_ALTIVEC)
+#ifdef ARCH_PPC
if (accel & MPEG2_ACCEL_PPC_ALTIVEC) {
mpeg2_cpu_state_save = state_save_altivec;
mpeg2_cpu_state_restore = state_restore_altivec;
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Libmpeg2-devel mailing list
Libmpeg2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/libmpeg2-devel
