diff options
Diffstat (limited to 'libmpeg2')
-rw-r--r-- | libmpeg2/cpu_accel.c | 12 | ||||
-rw-r--r-- | libmpeg2/cpu_state.c | 10 | ||||
-rw-r--r-- | libmpeg2/idct.c | 6 | ||||
-rw-r--r-- | libmpeg2/idct_alpha.c | 2 | ||||
-rw-r--r-- | libmpeg2/idct_altivec.c | 2 | ||||
-rw-r--r-- | libmpeg2/idct_mmx.c | 2 | ||||
-rw-r--r-- | libmpeg2/motion_comp.c | 14 | ||||
-rw-r--r-- | libmpeg2/motion_comp_alpha.c | 2 | ||||
-rw-r--r-- | libmpeg2/motion_comp_altivec.c | 2 | ||||
-rw-r--r-- | libmpeg2/motion_comp_arm.c | 2 | ||||
-rw-r--r-- | libmpeg2/motion_comp_mmx.c | 2 | ||||
-rw-r--r-- | libmpeg2/motion_comp_vis.c | 2 | ||||
-rw-r--r-- | libmpeg2/mpeg2_internal.h | 2 |
13 files changed, 30 insertions, 30 deletions
diff --git a/libmpeg2/cpu_accel.c b/libmpeg2/cpu_accel.c index 104ac2cfdf..f711f3282c 100644 --- a/libmpeg2/cpu_accel.c +++ b/libmpeg2/cpu_accel.c @@ -35,7 +35,7 @@ #include "cpudetect.h" -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#if ARCH_X86 || ARCH_X86_64 static inline uint32_t arch_accel (uint32_t accel) { /* Use MPlayer CPU detection instead of libmpeg2 variant. */ @@ -150,7 +150,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)) +#if defined(ACCEL_DETECT) && (ARCH_PPC || ARCH_SPARC) #include <signal.h> #include <setjmp.h> @@ -169,7 +169,7 @@ static RETSIGTYPE sigill_handler (int sig) } #endif /* ACCEL_DETECT && (ARCH_PPC || ARCH_SPARC) */ -#ifdef ARCH_PPC +#if ARCH_PPC static uint32_t arch_accel (uint32_t accel) { #ifdef ACCEL_DETECT @@ -206,7 +206,7 @@ static uint32_t arch_accel (uint32_t accel) } #endif /* ARCH_PPC */ -#ifdef ARCH_SPARC +#if ARCH_SPARC static uint32_t arch_accel (uint32_t accel) { if (accel & MPEG2_ACCEL_SPARC_VIS2) @@ -252,7 +252,7 @@ static uint32_t arch_accel (uint32_t accel) } #endif /* ARCH_SPARC */ -#ifdef ARCH_ALPHA +#if ARCH_ALPHA static inline uint32_t arch_accel (uint32_t accel) { if (accel & MPEG2_ACCEL_ALPHA_MVI) @@ -276,7 +276,7 @@ static inline uint32_t arch_accel (uint32_t accel) uint32_t mpeg2_detect_accel (uint32_t accel) { -#if defined (ARCH_X86) || defined (ARCH_X86_64) || defined (ARCH_PPC) || defined (ARCH_ALPHA) || defined (ARCH_SPARC) +#if ARCH_X86 || ARCH_X86_64 || ARCH_PPC || ARCH_ALPHA || ARCH_SPARC accel = arch_accel (accel); #endif return accel; diff --git a/libmpeg2/cpu_state.c b/libmpeg2/cpu_state.c index 2f2f64a987..d82b6738a7 100644 --- a/libmpeg2/cpu_state.c +++ b/libmpeg2/cpu_state.c @@ -29,21 +29,21 @@ #include "mpeg2.h" #include "attributes.h" #include "mpeg2_internal.h" -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#if ARCH_X86 || ARCH_X86_64 #include "mmx.h" #endif void (* mpeg2_cpu_state_save) (cpu_state_t * state) = NULL; void (* mpeg2_cpu_state_restore) (cpu_state_t * state) = NULL; -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#if ARCH_X86 || ARCH_X86_64 static void state_restore_mmx (cpu_state_t * state) { emms (); } #endif -#ifdef ARCH_PPC +#if 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" @@ -115,12 +115,12 @@ static void state_restore_altivec (cpu_state_t * state) void mpeg2_cpu_state_init (uint32_t accel) { -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#if ARCH_X86 || ARCH_X86_64 if (accel & MPEG2_ACCEL_X86_MMX) { mpeg2_cpu_state_restore = state_restore_mmx; } #endif -#ifdef ARCH_PPC +#if ARCH_PPC if (accel & MPEG2_ACCEL_PPC_ALTIVEC) { mpeg2_cpu_state_save = state_save_altivec; mpeg2_cpu_state_restore = state_restore_altivec; diff --git a/libmpeg2/idct.c b/libmpeg2/idct.c index e753053354..09a81159eb 100644 --- a/libmpeg2/idct.c +++ b/libmpeg2/idct.c @@ -239,7 +239,7 @@ static void mpeg2_idct_add_c (const int last, int16_t * block, void mpeg2_idct_init (uint32_t accel) { -#ifdef HAVE_SSE2 +#if HAVE_SSE2 if (accel & MPEG2_ACCEL_X86_SSE2) { mpeg2_idct_copy = mpeg2_idct_copy_sse2; mpeg2_idct_add = mpeg2_idct_add_sse2; @@ -258,14 +258,14 @@ void mpeg2_idct_init (uint32_t accel) mpeg2_idct_mmx_init (); } else #endif -#ifdef HAVE_ALTIVEC +#if HAVE_ALTIVEC if (accel & MPEG2_ACCEL_PPC_ALTIVEC) { mpeg2_idct_copy = mpeg2_idct_copy_altivec; mpeg2_idct_add = mpeg2_idct_add_altivec; mpeg2_idct_altivec_init (); } else #endif -#ifdef HAVE_MVI +#if HAVE_MVI if (accel & MPEG2_ACCEL_ALPHA_MVI) { mpeg2_idct_copy = mpeg2_idct_copy_mvi; mpeg2_idct_add = mpeg2_idct_add_mvi; diff --git a/libmpeg2/idct_alpha.c b/libmpeg2/idct_alpha.c index bc2f886492..e5886ed3ff 100644 --- a/libmpeg2/idct_alpha.c +++ b/libmpeg2/idct_alpha.c @@ -24,7 +24,7 @@ #include "config.h" -#ifdef ARCH_ALPHA +#if ARCH_ALPHA #include <stdlib.h> #include <inttypes.h> diff --git a/libmpeg2/idct_altivec.c b/libmpeg2/idct_altivec.c index b5b395a205..1403eeac87 100644 --- a/libmpeg2/idct_altivec.c +++ b/libmpeg2/idct_altivec.c @@ -23,7 +23,7 @@ #include "config.h" -#ifdef ARCH_PPC +#if ARCH_PPC #ifdef HAVE_ALTIVEC_H #include <altivec.h> diff --git a/libmpeg2/idct_mmx.c b/libmpeg2/idct_mmx.c index 50f8f18c3e..fe6215b20d 100644 --- a/libmpeg2/idct_mmx.c +++ b/libmpeg2/idct_mmx.c @@ -23,7 +23,7 @@ #include "config.h" -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#if ARCH_X86 || ARCH_X86_64 #include <inttypes.h> diff --git a/libmpeg2/motion_comp.c b/libmpeg2/motion_comp.c index d5934cd53b..9ef39290e5 100644 --- a/libmpeg2/motion_comp.c +++ b/libmpeg2/motion_comp.c @@ -37,37 +37,37 @@ mpeg2_mc_t mpeg2_mc; void mpeg2_mc_init (uint32_t accel) { -#ifdef HAVE_MMX2 +#if HAVE_MMX2 if (accel & MPEG2_ACCEL_X86_MMXEXT) mpeg2_mc = mpeg2_mc_mmxext; else #endif -#ifdef HAVE_3DNOW +#if HAVE_3DNOW if (accel & MPEG2_ACCEL_X86_3DNOW) mpeg2_mc = mpeg2_mc_3dnow; else #endif -#ifdef HAVE_MMX +#if HAVE_MMX if (accel & MPEG2_ACCEL_X86_MMX) mpeg2_mc = mpeg2_mc_mmx; else #endif -#ifdef HAVE_ALTIVEC +#if HAVE_ALTIVEC if (accel & MPEG2_ACCEL_PPC_ALTIVEC) mpeg2_mc = mpeg2_mc_altivec; else #endif -#ifdef ARCH_ALPHA +#if ARCH_ALPHA if (accel & MPEG2_ACCEL_ALPHA) mpeg2_mc = mpeg2_mc_alpha; else #endif -#ifdef HAVE_VIS +#if HAVE_VIS if (accel & MPEG2_ACCEL_SPARC_VIS) mpeg2_mc = mpeg2_mc_vis; else #endif -#ifdef ARCH_ARM +#if ARCH_ARM if (accel & MPEG2_ACCEL_ARM) mpeg2_mc = mpeg2_mc_arm; else diff --git a/libmpeg2/motion_comp_alpha.c b/libmpeg2/motion_comp_alpha.c index 05cd550841..a7f33d3914 100644 --- a/libmpeg2/motion_comp_alpha.c +++ b/libmpeg2/motion_comp_alpha.c @@ -22,7 +22,7 @@ #include "config.h" -#ifdef ARCH_ALPHA +#if ARCH_ALPHA #include <inttypes.h> diff --git a/libmpeg2/motion_comp_altivec.c b/libmpeg2/motion_comp_altivec.c index 4356aa6e78..f98aaedc90 100644 --- a/libmpeg2/motion_comp_altivec.c +++ b/libmpeg2/motion_comp_altivec.c @@ -23,7 +23,7 @@ #include "config.h" -#ifdef ARCH_PPC +#if ARCH_PPC #ifdef HAVE_ALTIVEC_H #include <altivec.h> diff --git a/libmpeg2/motion_comp_arm.c b/libmpeg2/motion_comp_arm.c index 0111f7f8d3..f783434a30 100644 --- a/libmpeg2/motion_comp_arm.c +++ b/libmpeg2/motion_comp_arm.c @@ -22,7 +22,7 @@ #include "config.h" -#ifdef ARCH_ARM +#if ARCH_ARM #include <inttypes.h> diff --git a/libmpeg2/motion_comp_mmx.c b/libmpeg2/motion_comp_mmx.c index fc265f4f99..b550f8c7c9 100644 --- a/libmpeg2/motion_comp_mmx.c +++ b/libmpeg2/motion_comp_mmx.c @@ -23,7 +23,7 @@ #include "config.h" -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#if ARCH_X86 || ARCH_X86_64 #include <inttypes.h> diff --git a/libmpeg2/motion_comp_vis.c b/libmpeg2/motion_comp_vis.c index 54c0f7e758..f6f3a315ee 100644 --- a/libmpeg2/motion_comp_vis.c +++ b/libmpeg2/motion_comp_vis.c @@ -22,7 +22,7 @@ #include "config.h" -#ifdef ARCH_SPARC +#if ARCH_SPARC #include <inttypes.h> diff --git a/libmpeg2/mpeg2_internal.h b/libmpeg2/mpeg2_internal.h index 2a651be571..73cbfb15ce 100644 --- a/libmpeg2/mpeg2_internal.h +++ b/libmpeg2/mpeg2_internal.h @@ -238,7 +238,7 @@ struct mpeg2dec_s { }; typedef struct { -#ifdef ARCH_PPC +#if ARCH_PPC uint8_t regv[12*16]; #endif int dummy; |