summaryrefslogtreecommitdiff
path: root/src/libmpeg2/motion_comp.c
diff options
context:
space:
mode:
authorRobin KAY <komadori@users.sourceforge.net>2004-04-28 00:38:08 +0000
committerRobin KAY <komadori@users.sourceforge.net>2004-04-28 00:38:08 +0000
commit2b18f4ca9e2984dc6cf9aa0352385242bb761fdc (patch)
treef876916012addaecb95d94f7dead9085c3e92612 /src/libmpeg2/motion_comp.c
parentc99e97ef0af36e3f3a081760a7bfdca4cfd7eeeb (diff)
downloadxine-lib-2b18f4ca9e2984dc6cf9aa0352385242bb761fdc.tar.gz
xine-lib-2b18f4ca9e2984dc6cf9aa0352385242bb761fdc.tar.bz2
Backport VIS motion_comp code from libmpeg2 CVS so libmpeg2 uses these routines as well as the recently synced ffmpeg tree.
CVS patchset: 6454 CVS date: 2004/04/28 00:38:08
Diffstat (limited to 'src/libmpeg2/motion_comp.c')
-rw-r--r--src/libmpeg2/motion_comp.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/src/libmpeg2/motion_comp.c b/src/libmpeg2/motion_comp.c
index e461dc749..59adf2531 100644
--- a/src/libmpeg2/motion_comp.c
+++ b/src/libmpeg2/motion_comp.c
@@ -33,6 +33,15 @@ mpeg2_mc_t mpeg2_mc;
void mpeg2_mc_init (uint32_t mm_accel)
{
+#ifdef LIBMPEG2_MLIB
+ if (mm_accel & MM_ACCEL_MLIB) {
+#ifdef LOG
+ fprintf (stderr, "Using mediaLib for motion compensation\n");
+#endif
+ mpeg2_mc = mpeg2_mc_mlib;
+ }
+#endif
+
#ifdef ARCH_X86
if (mm_accel & MM_ACCEL_X86_MMXEXT) {
#ifdef LOG
@@ -59,12 +68,12 @@ void mpeg2_mc_init (uint32_t mm_accel)
mpeg2_mc = mpeg2_mc_altivec;
} else
#endif
-#ifdef LIBMPEG2_MLIB
- if (mm_accel & MM_ACCEL_MLIB) {
+#ifdef ARCH_SPARC
+ if (mm_accel & MM_ACCEL_SPARC_VIS) {
#ifdef LOG
- fprintf (stderr, "Using mlib for motion compensation\n");
+ fprintf (stderr, "Using VIS for motion compensation\n");
#endif
- mpeg2_mc = mpeg2_mc_mlib;
+ mpeg2_mc = mpeg2_mc_vis;
} else
#endif
{