Commit 43efe86b authored by Christophe Massiot's avatar Christophe Massiot

* libmpeg2: Revert [1154] since it uses defines not available in libmpeg2.

parent c7f7a5a0
......@@ -127,7 +127,7 @@ static inline uint32_t arch_accel (uint32_t accel)
}
#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>
......
......@@ -43,7 +43,7 @@ static void state_restore_mmx (cpu_state_t * state)
}
#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 @@ void mpeg2_cpu_state_init (uint32_t accel)
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;
......
......@@ -246,7 +246,7 @@ void mpeg2_idct_init (uint32_t accel)
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;
......
......@@ -42,7 +42,7 @@ void mpeg2_mc_init (uint32_t accel)
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 @@ void mpeg2_mc_init (uint32_t accel)
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment