# HG changeset patch # User diego # Date 1230377606 0 # Node ID 19e2f1a50aa77e8c6fbfff089b387bd31c6ccd7f # Parent 3e0b4e4b707462ccc9b8e1d857421f1db098a76a consistency cosmetics: Rename POWERPC identifiers to PPC. diff -r 3e0b4e4b7074 -r 19e2f1a50aa7 Makefile --- a/Makefile Sat Dec 27 11:30:30 2008 +0000 +++ b/Makefile Sat Dec 27 11:33:26 2008 +0000 @@ -463,7 +463,7 @@ bfin/vp3_bfin.o \ bfin/vp3_idct_bfin.o \ -OBJS-$(ARCH_POWERPC) += ppc/dsputil_ppc.o \ +OBJS-$(ARCH_PPC) += ppc/dsputil_ppc.o \ ALTIVEC-OBJS-$(CONFIG_H264_DECODER) += ppc/h264_altivec.o ALTIVEC-OBJS-$(CONFIG_OLDSCALER) += ppc/imgresample_altivec.o diff -r 3e0b4e4b7074 -r 19e2f1a50aa7 dsputil.c --- a/dsputil.c Sat Dec 27 11:30:30 2008 +0000 +++ b/dsputil.c Sat Dec 27 11:33:26 2008 +0000 @@ -169,7 +169,7 @@ int j; j = src_scantable[i]; st->permutated[i] = permutation[j]; -#ifdef ARCH_POWERPC +#ifdef ARCH_PPC st->inverse[j] = i; #endif } @@ -4628,7 +4628,7 @@ if (ENABLE_MLIB) dsputil_init_mlib (c, avctx); if (ENABLE_VIS) dsputil_init_vis (c, avctx); if (ENABLE_ALPHA) dsputil_init_alpha (c, avctx); - if (ENABLE_POWERPC) dsputil_init_ppc (c, avctx); + if (ENABLE_PPC) dsputil_init_ppc (c, avctx); if (ENABLE_MMI) dsputil_init_mmi (c, avctx); if (ENABLE_SH4) dsputil_init_sh4 (c, avctx); if (ENABLE_BFIN) dsputil_init_bfin (c, avctx); diff -r 3e0b4e4b7074 -r 19e2f1a50aa7 dsputil.h --- a/dsputil.h Sat Dec 27 11:30:30 2008 +0000 +++ b/dsputil.h Sat Dec 27 11:33:26 2008 +0000 @@ -173,7 +173,7 @@ const uint8_t *scantable; uint8_t permutated[64]; uint8_t raster_end[64]; -#ifdef ARCH_POWERPC +#ifdef ARCH_PPC /** Used by dct_quantize_altivec to find last-non-zero */ DECLARE_ALIGNED(16, uint8_t, inverse[64]); #endif @@ -616,7 +616,7 @@ # define STRIDE_ALIGN 16 #endif -#elif defined(ARCH_POWERPC) +#elif defined(ARCH_PPC) extern int mm_flags; diff -r 3e0b4e4b7074 -r 19e2f1a50aa7 libxvidff.c --- a/libxvidff.c Sat Dec 27 11:30:30 2008 +0000 +++ b/libxvidff.c Sat Dec 27 11:33:26 2008 +0000 @@ -166,7 +166,7 @@ xvid_gbl_init.version = XVID_VERSION; xvid_gbl_init.debug = 0; -#ifdef ARCH_POWERPC +#ifdef ARCH_PPC /* Xvid's PPC support is borked, use libavcodec to detect */ #ifdef HAVE_ALTIVEC if( has_altivec() ) { diff -r 3e0b4e4b7074 -r 19e2f1a50aa7 mathops.h --- a/mathops.h Sat Dec 27 11:30:30 2008 +0000 +++ b/mathops.h Sat Dec 27 11:33:26 2008 +0000 @@ -32,7 +32,7 @@ #include "arm/mathops.h" -#elif defined(ARCH_POWERPC) +#elif defined(ARCH_PPC) #include "ppc/mathops.h" diff -r 3e0b4e4b7074 -r 19e2f1a50aa7 ppc/mathops.h --- a/ppc/mathops.h Sat Dec 27 11:30:30 2008 +0000 +++ b/ppc/mathops.h Sat Dec 27 11:33:26 2008 +0000 @@ -23,7 +23,7 @@ #ifndef AVCODEC_PPC_MATHOPS_H #define AVCODEC_PPC_MATHOPS_H -#if defined(ARCH_POWERPC_405) +#if defined(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 -r 3e0b4e4b7074 -r 19e2f1a50aa7 simple_idct.c --- a/simple_idct.c Sat Dec 27 11:30:30 2008 +0000 +++ b/simple_idct.c Sat Dec 27 11:33:26 2008 +0000 @@ -55,7 +55,7 @@ #define COL_SHIFT 20 // 6 #endif -#if defined(ARCH_POWERPC_405) +#if defined(ARCH_PPC_405) /* signed 16x16 -> 32 multiply add accumulate */ #define MAC16(rt, ra, rb) \