diff options
| author | Conrad Parker <conrad@users.sourceforge.net> | 2004-06-01 14:01:29 +0000 |
|---|---|---|
| committer | Conrad Parker <conrad@users.sourceforge.net> | 2004-06-01 14:01:29 +0000 |
| commit | 1e58df533d8b4b464ace641c71fb477f03e077cb (patch) | |
| tree | 0fd3932f08d9a4f8b86b81637f52be488e3eb44e | |
| parent | cc2e7da221cc4ba3397e36ed24b1dede7f4e9fb3 (diff) | |
| download | xine-lib-1e58df533d8b4b464ace641c71fb477f03e077cb.tar.gz xine-lib-1e58df533d8b4b464ace641c71fb477f03e077cb.tar.bz2 | |
applied patch from Daniel Mack disabling altivec if ENABLE_ALTIVEC is not set.
CVS patchset: 6624
CVS date: 2004/06/01 14:01:29
| -rw-r--r-- | src/libmpeg2/cpu_state.c | 4 | ||||
| -rw-r--r-- | src/libmpeg2/idct.c | 2 | ||||
| -rw-r--r-- | src/libmpeg2/idct_altivec.c | 2 | ||||
| -rw-r--r-- | src/libmpeg2/motion_comp.c | 2 | ||||
| -rw-r--r-- | src/libmpeg2/motion_comp_altivec.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/libmpeg2/cpu_state.c b/src/libmpeg2/cpu_state.c index 5a93c6181..db876cf98 100644 --- a/src/libmpeg2/cpu_state.c +++ b/src/libmpeg2/cpu_state.c @@ -39,7 +39,7 @@ static void state_restore_mmx (cpu_state_t * state) } #endif -#ifdef ARCH_PPC +#if defined (ARCH_PPC) && defined (ENABLE_ALTIVEC) static void state_save_altivec (cpu_state_t * state) { asm (" \n" @@ -106,7 +106,7 @@ void mpeg2_cpu_state_init (uint32_t mm_accel) mpeg2_cpu_state_restore = state_restore_mmx; } #endif -#ifdef ARCH_PPC +#if defined (ARCH_PPC) && defined (ENABLE_ALTIVEC) if (mm_accel & MM_ACCEL_PPC_ALTIVEC) { mpeg2_cpu_state_save = state_save_altivec; mpeg2_cpu_state_restore = state_restore_altivec; diff --git a/src/libmpeg2/idct.c b/src/libmpeg2/idct.c index d2b3ed866..ac0ad6e0e 100644 --- a/src/libmpeg2/idct.c +++ b/src/libmpeg2/idct.c @@ -303,7 +303,7 @@ void mpeg2_idct_init (uint32_t mm_accel) mpeg2_idct_mmx_init (); } else #endif -#ifdef ARCH_PPC +#if defined (ARCH_PPC) && defined (ENABLE_ALTIVEC) if (mm_accel & MM_ACCEL_PPC_ALTIVEC) { #ifdef LOG fprintf (stderr, "Using altivec for IDCT transform\n"); diff --git a/src/libmpeg2/idct_altivec.c b/src/libmpeg2/idct_altivec.c index 981b986d0..12c227aea 100644 --- a/src/libmpeg2/idct_altivec.c +++ b/src/libmpeg2/idct_altivec.c @@ -25,7 +25,7 @@ #include "config.h" -#ifdef ARCH_PPC +#if defined (ARCH_PPC) && defined (ENABLE_ALTIVEC) #include <inttypes.h> diff --git a/src/libmpeg2/motion_comp.c b/src/libmpeg2/motion_comp.c index 59adf2531..d20dceef8 100644 --- a/src/libmpeg2/motion_comp.c +++ b/src/libmpeg2/motion_comp.c @@ -60,7 +60,7 @@ void mpeg2_mc_init (uint32_t mm_accel) mpeg2_mc = mpeg2_mc_mmx; } else #endif -#ifdef ARCH_PPC +#if defined (ARCH_PPC) && defined (ENABLE_ALTIVEC) if (mm_accel & MM_ACCEL_PPC_ALTIVEC) { #ifdef LOG fprintf (stderr, "Using altivec for motion compensation\n"); diff --git a/src/libmpeg2/motion_comp_altivec.c b/src/libmpeg2/motion_comp_altivec.c index 2b7e75405..8ad951f1a 100644 --- a/src/libmpeg2/motion_comp_altivec.c +++ b/src/libmpeg2/motion_comp_altivec.c @@ -25,7 +25,7 @@ #include "config.h" -#ifdef ARCH_PPC +#if defined (ARCH_PPC) && defined (ENABLE_ALTIVEC) #include <inttypes.h> |