diff options
author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
---|---|---|
committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
commit | b250f9c66d3ddd84652d158fb979a5f21e3f2c71 (patch) | |
tree | ef84366029d6f8af6ed82e90c5f188bb7dfc844d /libavcodec/ppc | |
parent | 959da985b03570cfe7d239c0ba6d550ecb04c460 (diff) | |
download | ffmpeg-streaming-b250f9c66d3ddd84652d158fb979a5f21e3f2c71.zip ffmpeg-streaming-b250f9c66d3ddd84652d158fb979a5f21e3f2c71.tar.gz |
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ppc')
-rw-r--r-- | libavcodec/ppc/dsputil_ppc.c | 18 | ||||
-rw-r--r-- | libavcodec/ppc/dsputil_ppc.h | 4 | ||||
-rw-r--r-- | libavcodec/ppc/gcc_fixes.h | 2 | ||||
-rw-r--r-- | libavcodec/ppc/idct_altivec.c | 4 | ||||
-rw-r--r-- | libavcodec/ppc/mathops.h | 2 | ||||
-rw-r--r-- | libavcodec/ppc/util_altivec.h | 2 |
6 files changed, 16 insertions, 16 deletions
diff --git a/libavcodec/ppc/dsputil_ppc.c b/libavcodec/ppc/dsputil_ppc.c index 124453e..b07468b 100644 --- a/libavcodec/ppc/dsputil_ppc.c +++ b/libavcodec/ppc/dsputil_ppc.c @@ -24,7 +24,7 @@ #include "dsputil_ppc.h" -#ifdef HAVE_ALTIVEC +#if HAVE_ALTIVEC #include "dsputil_altivec.h" void fdct_altivec(int16_t *block); @@ -48,7 +48,7 @@ int mm_flags = 0; int mm_support(void) { int result = 0; -#ifdef HAVE_ALTIVEC +#if HAVE_ALTIVEC if (has_altivec()) { result |= FF_MM_ALTIVEC; } @@ -56,7 +56,7 @@ int mm_support(void) return result; } -#ifdef CONFIG_POWERPC_PERF +#if CONFIG_POWERPC_PERF unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][powerpc_data_total]; /* list below must match enum in dsputil_ppc.h */ static unsigned char* perfname[] = { @@ -91,7 +91,7 @@ static unsigned char* perfname[] = { #include <stdio.h> #endif -#ifdef CONFIG_POWERPC_PERF +#if CONFIG_POWERPC_PERF void powerpc_display_perf_report(void) { int i, j; @@ -165,7 +165,7 @@ POWERPC_PERF_STOP_COUNT(powerpc_clear_blocks_dcbz32, 1); /* same as above, when dcbzl clear a whole 128B cache line i.e. the PPC970 aka G5 */ -#ifdef HAVE_DCBZL +#if HAVE_DCBZL void clear_blocks_dcbz128_ppc(DCTELEM *blocks) { POWERPC_PERF_DECLARE(powerpc_clear_blocks_dcbz128, 1); @@ -195,7 +195,7 @@ void clear_blocks_dcbz128_ppc(DCTELEM *blocks) } #endif -#ifdef HAVE_DCBZL +#if HAVE_DCBZL /* check dcbz report how many bytes are set to 0 by dcbz */ /* update 24/06/2003 : replace dcbz by dcbzl to get the intended effect (Apple "fixed" dcbz) @@ -261,7 +261,7 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx) break; } -#ifdef HAVE_ALTIVEC +#if HAVE_ALTIVEC if(ENABLE_H264_DECODER) dsputil_h264_init_ppc(c, avctx); if (has_altivec()) { @@ -275,7 +275,7 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx) int_init_altivec(c, avctx); c->gmc1 = gmc1_altivec; -#ifdef CONFIG_ENCODERS +#if CONFIG_ENCODERS if (avctx->dct_algo == FF_DCT_AUTO || avctx->dct_algo == FF_DCT_ALTIVEC) { c->fdct = fdct_altivec; @@ -291,7 +291,7 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx) } } -#ifdef CONFIG_POWERPC_PERF +#if CONFIG_POWERPC_PERF { int i, j; for (i = 0 ; i < powerpc_perf_total ; i++) { diff --git a/libavcodec/ppc/dsputil_ppc.h b/libavcodec/ppc/dsputil_ppc.h index 578c961..d9740ce 100644 --- a/libavcodec/ppc/dsputil_ppc.h +++ b/libavcodec/ppc/dsputil_ppc.h @@ -21,7 +21,7 @@ #ifndef AVCODEC_PPC_DSPUTIL_PPC_H #define AVCODEC_PPC_DSPUTIL_PPC_H -#ifdef CONFIG_POWERPC_PERF +#if CONFIG_POWERPC_PERF void powerpc_display_perf_report(void); /* the 604* have 2, the G3* have 4, the G4s have 6, and the G5 are completely different (they MUST use @@ -68,7 +68,7 @@ enum powerpc_data_index { }; extern unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][powerpc_data_total]; -#ifndef HAVE_PPC64 +#if !HAVE_PPC64 #define POWERP_PMC_DATATYPE unsigned long #define POWERPC_GET_PMC1(a) __asm__ volatile("mfspr %0, 937" : "=r" (a)) #define POWERPC_GET_PMC2(a) __asm__ volatile("mfspr %0, 938" : "=r" (a)) diff --git a/libavcodec/ppc/gcc_fixes.h b/libavcodec/ppc/gcc_fixes.h index efa7a57..a97921f 100644 --- a/libavcodec/ppc/gcc_fixes.h +++ b/libavcodec/ppc/gcc_fixes.h @@ -25,7 +25,7 @@ #include "config.h" -#ifdef HAVE_ALTIVEC_H +#if HAVE_ALTIVEC_H #include <altivec.h> #endif diff --git a/libavcodec/ppc/idct_altivec.c b/libavcodec/ppc/idct_altivec.c index 94b6598..d262282 100644 --- a/libavcodec/ppc/idct_altivec.c +++ b/libavcodec/ppc/idct_altivec.c @@ -161,7 +161,7 @@ void idct_put_altivec(uint8_t* dest, int stride, vec_s16* block) POWERPC_PERF_DECLARE(altivec_idct_put_num, 1); vec_u8 tmp; -#ifdef CONFIG_POWERPC_PERF +#if CONFIG_POWERPC_PERF POWERPC_PERF_START_COUNT(altivec_idct_put_num, 1); #endif IDCT @@ -192,7 +192,7 @@ POWERPC_PERF_DECLARE(altivec_idct_add_num, 1); vec_u8 perm1; vec_u8 p0, p1, p; -#ifdef CONFIG_POWERPC_PERF +#if CONFIG_POWERPC_PERF POWERPC_PERF_START_COUNT(altivec_idct_add_num, 1); #endif diff --git a/libavcodec/ppc/mathops.h b/libavcodec/ppc/mathops.h index edfe2ea..beba351 100644 --- a/libavcodec/ppc/mathops.h +++ b/libavcodec/ppc/mathops.h @@ -23,7 +23,7 @@ #ifndef AVCODEC_PPC_MATHOPS_H #define AVCODEC_PPC_MATHOPS_H -#if defined(ARCH_PPC_405) +#if ARCH_PPC_405 /* signed 16x16 -> 32 multiply add accumulate */ #define MAC16(rt, ra, rb) \ __asm__ ("maclhw %0, %2, %3" : "=r" (rt) : "0" (rt), "r" (ra), "r" (rb)); diff --git a/libavcodec/ppc/util_altivec.h b/libavcodec/ppc/util_altivec.h index c54d0ea..b52c159 100644 --- a/libavcodec/ppc/util_altivec.h +++ b/libavcodec/ppc/util_altivec.h @@ -28,7 +28,7 @@ #include "config.h" -#ifdef HAVE_ALTIVEC_H +#if HAVE_ALTIVEC_H #include <altivec.h> #endif |