From 79cb09b2f76c86dc988a5eba33b0cf8bd08a9b0e Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Sat, 27 Dec 2008 11:33:26 +0000
Subject: consistency cosmetics: Rename POWERPC identifiers to PPC.

Originally committed as revision 16359 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/Makefile      | 2 +-
 libavcodec/dsputil.c     | 4 ++--
 libavcodec/dsputil.h     | 4 ++--
 libavcodec/libxvidff.c   | 2 +-
 libavcodec/mathops.h     | 2 +-
 libavcodec/ppc/mathops.h | 2 +-
 libavcodec/simple_idct.c | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'libavcodec')

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index aaeb9a40f4..ca94d169e9 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -463,7 +463,7 @@ OBJS-$(ARCH_BFIN)                      += bfin/dsputil_bfin.o           \
                                           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 --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 78942775e4..76f5dbbf4d 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -169,7 +169,7 @@ void ff_init_scantable(uint8_t *permutation, ScanTable *st, const uint8_t *src_s
         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 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx)
     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 --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 5beda8b423..88ed315e6a 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -173,7 +173,7 @@ typedef struct ScanTable{
     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 @@ extern int mm_flags;
 #   define STRIDE_ALIGN 16
 #endif
 
-#elif defined(ARCH_POWERPC)
+#elif defined(ARCH_PPC)
 
 extern int mm_flags;
 
diff --git a/libavcodec/libxvidff.c b/libavcodec/libxvidff.c
index 5e1934c455..314945961b 100644
--- a/libavcodec/libxvidff.c
+++ b/libavcodec/libxvidff.c
@@ -166,7 +166,7 @@ av_cold int ff_xvid_encode_init(AVCodecContext *avctx)  {
     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 --git a/libavcodec/mathops.h b/libavcodec/mathops.h
index 26405dd6f1..07265c81f5 100644
--- a/libavcodec/mathops.h
+++ b/libavcodec/mathops.h
@@ -32,7 +32,7 @@
 
 #include "arm/mathops.h"
 
-#elif defined(ARCH_POWERPC)
+#elif defined(ARCH_PPC)
 
 #include "ppc/mathops.h"
 
diff --git a/libavcodec/ppc/mathops.h b/libavcodec/ppc/mathops.h
index 776ee62eca..edfe2ea242 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_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 --git a/libavcodec/simple_idct.c b/libavcodec/simple_idct.c
index 62f5b2456b..2f8edf83e0 100644
--- a/libavcodec/simple_idct.c
+++ b/libavcodec/simple_idct.c
@@ -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) \
-- 
cgit v1.2.3