Revision 79cb09b2

View differences:

configure
795 795
    m68k
796 796
    mips
797 797
    parisc
798
    powerpc
798
    ppc
799 799
    s390
800 800
    sh4
801 801
    sparc
......
932 932
# code dependency declarations
933 933

  
934 934
# architecture extensions
935
altivec_deps="powerpc"
935
altivec_deps="ppc"
936 936
armv5te_deps="arm"
937 937
armv6_deps="arm"
938 938
armvfp_deps="arm"
......
1317 1317
        enable fast_64bit
1318 1318
    ;;
1319 1319
    "Power Macintosh"|ppc|powerpc)
1320
        arch="powerpc"
1320
        arch="ppc"
1321 1321
        enable fast_unaligned
1322 1322
    ;;
1323 1323
    ppc64)
1324
        arch="powerpc"
1324
        arch="ppc"
1325 1325
        enable fast_64bit
1326 1326
        enable fast_unaligned
1327 1327
    ;;
......
1754 1754

  
1755 1755
# check for assembler specific support
1756 1756

  
1757
if test $arch = "powerpc"; then
1757
if test $arch = "ppc"; then
1758 1758
    check_asm dcbzl '"dcbzl 0, 1"'
1759 1759
fi
1760 1760

  
......
2145 2145
if test $arch = "mips"; then
2146 2146
    echo "MMI enabled               ${mmi-no}"
2147 2147
fi
2148
if test $arch = "powerpc"; then
2148
if test $arch = "ppc"; then
2149 2149
    echo "AltiVec enabled           ${altivec-no}"
2150 2150
    echo "dcbzl available           ${dcbzl-no}"
2151 2151
fi
libavcodec/Makefile
463 463
                                          bfin/vp3_bfin.o               \
464 464
                                          bfin/vp3_idct_bfin.o          \
465 465

  
466
OBJS-$(ARCH_POWERPC)                   += ppc/dsputil_ppc.o             \
466
OBJS-$(ARCH_PPC)                       += ppc/dsputil_ppc.o             \
467 467

  
468 468
ALTIVEC-OBJS-$(CONFIG_H264_DECODER)    += ppc/h264_altivec.o
469 469
ALTIVEC-OBJS-$(CONFIG_OLDSCALER)       += ppc/imgresample_altivec.o
libavcodec/dsputil.c
169 169
        int j;
170 170
        j = src_scantable[i];
171 171
        st->permutated[i] = permutation[j];
172
#ifdef ARCH_POWERPC
172
#ifdef ARCH_PPC
173 173
        st->inverse[j] = i;
174 174
#endif
175 175
    }
......
4628 4628
    if (ENABLE_MLIB)     dsputil_init_mlib  (c, avctx);
4629 4629
    if (ENABLE_VIS)      dsputil_init_vis   (c, avctx);
4630 4630
    if (ENABLE_ALPHA)    dsputil_init_alpha (c, avctx);
4631
    if (ENABLE_POWERPC)  dsputil_init_ppc   (c, avctx);
4631
    if (ENABLE_PPC)      dsputil_init_ppc   (c, avctx);
4632 4632
    if (ENABLE_MMI)      dsputil_init_mmi   (c, avctx);
4633 4633
    if (ENABLE_SH4)      dsputil_init_sh4   (c, avctx);
4634 4634
    if (ENABLE_BFIN)     dsputil_init_bfin  (c, avctx);
libavcodec/dsputil.h
173 173
    const uint8_t *scantable;
174 174
    uint8_t permutated[64];
175 175
    uint8_t raster_end[64];
176
#ifdef ARCH_POWERPC
176
#ifdef ARCH_PPC
177 177
                /** Used by dct_quantize_altivec to find last-non-zero */
178 178
    DECLARE_ALIGNED(16, uint8_t, inverse[64]);
179 179
#endif
......
616 616
#   define STRIDE_ALIGN 16
617 617
#endif
618 618

  
619
#elif defined(ARCH_POWERPC)
619
#elif defined(ARCH_PPC)
620 620

  
621 621
extern int mm_flags;
622 622

  
libavcodec/libxvidff.c
166 166
    xvid_gbl_init.version = XVID_VERSION;
167 167
    xvid_gbl_init.debug = 0;
168 168

  
169
#ifdef ARCH_POWERPC
169
#ifdef ARCH_PPC
170 170
    /* Xvid's PPC support is borked, use libavcodec to detect */
171 171
#ifdef HAVE_ALTIVEC
172 172
    if( has_altivec() ) {
libavcodec/mathops.h
32 32

  
33 33
#include "arm/mathops.h"
34 34

  
35
#elif defined(ARCH_POWERPC)
35
#elif defined(ARCH_PPC)
36 36

  
37 37
#include "ppc/mathops.h"
38 38

  
libavcodec/ppc/mathops.h
23 23
#ifndef AVCODEC_PPC_MATHOPS_H
24 24
#define AVCODEC_PPC_MATHOPS_H
25 25

  
26
#if defined(ARCH_POWERPC_405)
26
#if defined(ARCH_PPC_405)
27 27
/* signed 16x16 -> 32 multiply add accumulate */
28 28
#define MAC16(rt, ra, rb) \
29 29
    __asm__ ("maclhw %0, %2, %3" : "=r" (rt) : "0" (rt), "r" (ra), "r" (rb));
libavcodec/simple_idct.c
55 55
#define COL_SHIFT 20 // 6
56 56
#endif
57 57

  
58
#if defined(ARCH_POWERPC_405)
58
#if defined(ARCH_PPC_405)
59 59

  
60 60
/* signed 16x16 -> 32 multiply add accumulate */
61 61
#define MAC16(rt, ra, rb) \
libavutil/common.h
323 323
        }\
324 324
    }
325 325

  
326
#if defined(ARCH_X86) || defined(ARCH_POWERPC) || defined(ARCH_BFIN)
326
#if defined(ARCH_X86) || defined(ARCH_PPC) || defined(ARCH_BFIN)
327 327
#define AV_READ_TIME read_time
328 328
#if defined(ARCH_X86)
329 329
static inline uint64_t read_time(void)

Also available in: Unified diff