diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-07 13:07:48 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-07 13:15:37 +0300 |
commit | 267a3f4c9c00848f32c341595d2d831157a79bee (patch) | |
tree | cdef15bb746e3a41b1813076f24035fcc8385c30 /libmpcodecs/vd_libmpeg2.c | |
parent | 5484215d044522bcd30516e458e421f403ca8e35 (diff) | |
parent | 96fa9c4e249e9467f21e32191882e511e762fb1f (diff) | |
download | mpv-267a3f4c9c00848f32c341595d2d831157a79bee.tar.bz2 mpv-267a3f4c9c00848f32c341595d2d831157a79bee.tar.xz |
Merge svn changes up to r26680
Conflicts:
Makefile
configure
osdep/timer-darwin.c
Diffstat (limited to 'libmpcodecs/vd_libmpeg2.c')
-rw-r--r-- | libmpcodecs/vd_libmpeg2.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libmpcodecs/vd_libmpeg2.c b/libmpcodecs/vd_libmpeg2.c index 8be6d7f841..3bd17a4e0e 100644 --- a/libmpcodecs/vd_libmpeg2.c +++ b/libmpcodecs/vd_libmpeg2.c @@ -78,7 +78,16 @@ static int init(sh_video_t *sh){ accel |= MPEG2_ACCEL_X86_SSE2; if(gCpuCaps.hasAltiVec) accel |= MPEG2_ACCEL_PPC_ALTIVEC; - #ifdef HAVE_VIS + #ifdef ARCH_ALPHA + accel |= MPEG2_ACCEL_ALPHA; + #elif ARCH_ARM + accel |= MPEG2_ACCEL_ARM; + #endif + #ifdef HAVE_IWMMXT + accel |= MPEG2_ACCEL_ARM_IWMMXT; + #elif HAVE_MVI + accel |= MPEG2_ACCEL_ALPHA_MVI; + #elif HAVE_VIS accel |= MPEG2_ACCEL_SPARC_VIS; #endif mpeg2_accel(accel); |