summaryrefslogtreecommitdiffstats
path: root/libmpeg2
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-08-14 15:17:39 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-08-14 15:17:39 +0000
commitf256f4f9b959b9f846c4dba6231ccf081f5bdf3c (patch)
treed89319c768985d7493388af94fc8b06e60a84a84 /libmpeg2
parent40a0c7778d29f2083ccbba25bea2cc4ea24783a7 (diff)
downloadmpv-f256f4f9b959b9f846c4dba6231ccf081f5bdf3c.tar.bz2
mpv-f256f4f9b959b9f846c4dba6231ccf081f5bdf3c.tar.xz
Improved SPARC CPU detection and SPARC compilation fixes.
patch by jb13@gomerbud.com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13019 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpeg2')
-rw-r--r--libmpeg2/Makefile4
-rw-r--r--libmpeg2/cpu_accel.c2
-rw-r--r--libmpeg2/motion_comp.c2
3 files changed, 7 insertions, 1 deletions
diff --git a/libmpeg2/Makefile b/libmpeg2/Makefile
index 2c4c77b467..19674ed5bd 100644
--- a/libmpeg2/Makefile
+++ b/libmpeg2/Makefile
@@ -13,6 +13,10 @@ ifeq ($(TARGET_ALTIVEC),yes)
SRCS += motion_comp_altivec.c idct_altivec.c
endif
+ifeq ($(TARGET_VIS),yes)
+SRCS += motion_comp_vis.c
+endif
+
.SUFFIXES: .c .o
# .PHONY: all clean
diff --git a/libmpeg2/cpu_accel.c b/libmpeg2/cpu_accel.c
index e87f5b20a9..bf0d94bb59 100644
--- a/libmpeg2/cpu_accel.c
+++ b/libmpeg2/cpu_accel.c
@@ -108,7 +108,7 @@ static inline uint32_t arch_accel (void)
}
#endif /* ARCH_X86 */
-#if defined(ARCH_PPC) || defined(ARCH_SPARC)
+#if defined(ARCH_PPC) || (defined(ARCH_SPARC) && defined(HAVE_VIS))
#include <signal.h>
#include <setjmp.h>
diff --git a/libmpeg2/motion_comp.c b/libmpeg2/motion_comp.c
index 6686b016c1..f22370884a 100644
--- a/libmpeg2/motion_comp.c
+++ b/libmpeg2/motion_comp.c
@@ -55,10 +55,12 @@ void mpeg2_mc_init (uint32_t accel)
else
#endif
#ifdef ARCH_SPARC
+#ifdef HAVE_VIS
if (accel & MPEG2_ACCEL_SPARC_VIS)
mpeg2_mc = mpeg2_mc_vis;
else
#endif
+#endif
mpeg2_mc = mpeg2_mc_c;
}