Originally committed as revision 16359 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
@@ -795,7 +795,7 @@ ARCH_LIST=' | |||||
m68k | m68k | ||||
mips | mips | ||||
parisc | parisc | ||||
powerpc | |||||
ppc | |||||
s390 | s390 | ||||
sh4 | sh4 | ||||
sparc | sparc | ||||
@@ -932,7 +932,7 @@ CMDLINE_SET=" | |||||
# code dependency declarations | # code dependency declarations | ||||
# architecture extensions | # architecture extensions | ||||
altivec_deps="powerpc" | |||||
altivec_deps="ppc" | |||||
armv5te_deps="arm" | armv5te_deps="arm" | ||||
armv6_deps="arm" | armv6_deps="arm" | ||||
armvfp_deps="arm" | armvfp_deps="arm" | ||||
@@ -1317,11 +1317,11 @@ EOF | |||||
enable fast_64bit | enable fast_64bit | ||||
;; | ;; | ||||
"Power Macintosh"|ppc|powerpc) | "Power Macintosh"|ppc|powerpc) | ||||
arch="powerpc" | |||||
arch="ppc" | |||||
enable fast_unaligned | enable fast_unaligned | ||||
;; | ;; | ||||
ppc64) | ppc64) | ||||
arch="powerpc" | |||||
arch="ppc" | |||||
enable fast_64bit | enable fast_64bit | ||||
enable fast_unaligned | enable fast_unaligned | ||||
;; | ;; | ||||
@@ -1754,7 +1754,7 @@ fi | |||||
# check for assembler specific support | # check for assembler specific support | ||||
if test $arch = "powerpc"; then | |||||
if test $arch = "ppc"; then | |||||
check_asm dcbzl '"dcbzl 0, 1"' | check_asm dcbzl '"dcbzl 0, 1"' | ||||
fi | fi | ||||
@@ -2145,7 +2145,7 @@ fi | |||||
if test $arch = "mips"; then | if test $arch = "mips"; then | ||||
echo "MMI enabled ${mmi-no}" | echo "MMI enabled ${mmi-no}" | ||||
fi | fi | ||||
if test $arch = "powerpc"; then | |||||
if test $arch = "ppc"; then | |||||
echo "AltiVec enabled ${altivec-no}" | echo "AltiVec enabled ${altivec-no}" | ||||
echo "dcbzl available ${dcbzl-no}" | echo "dcbzl available ${dcbzl-no}" | ||||
fi | fi | ||||
@@ -463,7 +463,7 @@ OBJS-$(ARCH_BFIN) += bfin/dsputil_bfin.o \ | |||||
bfin/vp3_bfin.o \ | bfin/vp3_bfin.o \ | ||||
bfin/vp3_idct_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_H264_DECODER) += ppc/h264_altivec.o | ||||
ALTIVEC-OBJS-$(CONFIG_OLDSCALER) += ppc/imgresample_altivec.o | ALTIVEC-OBJS-$(CONFIG_OLDSCALER) += ppc/imgresample_altivec.o | ||||
@@ -169,7 +169,7 @@ void ff_init_scantable(uint8_t *permutation, ScanTable *st, const uint8_t *src_s | |||||
int j; | int j; | ||||
j = src_scantable[i]; | j = src_scantable[i]; | ||||
st->permutated[i] = permutation[j]; | st->permutated[i] = permutation[j]; | ||||
#ifdef ARCH_POWERPC | |||||
#ifdef ARCH_PPC | |||||
st->inverse[j] = i; | st->inverse[j] = i; | ||||
#endif | #endif | ||||
} | } | ||||
@@ -4628,7 +4628,7 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx) | |||||
if (ENABLE_MLIB) dsputil_init_mlib (c, avctx); | if (ENABLE_MLIB) dsputil_init_mlib (c, avctx); | ||||
if (ENABLE_VIS) dsputil_init_vis (c, avctx); | if (ENABLE_VIS) dsputil_init_vis (c, avctx); | ||||
if (ENABLE_ALPHA) dsputil_init_alpha (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_MMI) dsputil_init_mmi (c, avctx); | ||||
if (ENABLE_SH4) dsputil_init_sh4 (c, avctx); | if (ENABLE_SH4) dsputil_init_sh4 (c, avctx); | ||||
if (ENABLE_BFIN) dsputil_init_bfin (c, avctx); | if (ENABLE_BFIN) dsputil_init_bfin (c, avctx); | ||||
@@ -173,7 +173,7 @@ typedef struct ScanTable{ | |||||
const uint8_t *scantable; | const uint8_t *scantable; | ||||
uint8_t permutated[64]; | uint8_t permutated[64]; | ||||
uint8_t raster_end[64]; | uint8_t raster_end[64]; | ||||
#ifdef ARCH_POWERPC | |||||
#ifdef ARCH_PPC | |||||
/** Used by dct_quantize_altivec to find last-non-zero */ | /** Used by dct_quantize_altivec to find last-non-zero */ | ||||
DECLARE_ALIGNED(16, uint8_t, inverse[64]); | DECLARE_ALIGNED(16, uint8_t, inverse[64]); | ||||
#endif | #endif | ||||
@@ -616,7 +616,7 @@ extern int mm_flags; | |||||
# define STRIDE_ALIGN 16 | # define STRIDE_ALIGN 16 | ||||
#endif | #endif | ||||
#elif defined(ARCH_POWERPC) | |||||
#elif defined(ARCH_PPC) | |||||
extern int mm_flags; | extern int mm_flags; | ||||
@@ -166,7 +166,7 @@ av_cold int ff_xvid_encode_init(AVCodecContext *avctx) { | |||||
xvid_gbl_init.version = XVID_VERSION; | xvid_gbl_init.version = XVID_VERSION; | ||||
xvid_gbl_init.debug = 0; | xvid_gbl_init.debug = 0; | ||||
#ifdef ARCH_POWERPC | |||||
#ifdef ARCH_PPC | |||||
/* Xvid's PPC support is borked, use libavcodec to detect */ | /* Xvid's PPC support is borked, use libavcodec to detect */ | ||||
#ifdef HAVE_ALTIVEC | #ifdef HAVE_ALTIVEC | ||||
if( has_altivec() ) { | if( has_altivec() ) { | ||||
@@ -32,7 +32,7 @@ | |||||
#include "arm/mathops.h" | #include "arm/mathops.h" | ||||
#elif defined(ARCH_POWERPC) | |||||
#elif defined(ARCH_PPC) | |||||
#include "ppc/mathops.h" | #include "ppc/mathops.h" | ||||
@@ -23,7 +23,7 @@ | |||||
#ifndef AVCODEC_PPC_MATHOPS_H | #ifndef AVCODEC_PPC_MATHOPS_H | ||||
#define 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 */ | /* signed 16x16 -> 32 multiply add accumulate */ | ||||
#define MAC16(rt, ra, rb) \ | #define MAC16(rt, ra, rb) \ | ||||
__asm__ ("maclhw %0, %2, %3" : "=r" (rt) : "0" (rt), "r" (ra), "r" (rb)); | __asm__ ("maclhw %0, %2, %3" : "=r" (rt) : "0" (rt), "r" (ra), "r" (rb)); | ||||
@@ -55,7 +55,7 @@ | |||||
#define COL_SHIFT 20 // 6 | #define COL_SHIFT 20 // 6 | ||||
#endif | #endif | ||||
#if defined(ARCH_POWERPC_405) | |||||
#if defined(ARCH_PPC_405) | |||||
/* signed 16x16 -> 32 multiply add accumulate */ | /* signed 16x16 -> 32 multiply add accumulate */ | ||||
#define MAC16(rt, ra, rb) \ | #define MAC16(rt, ra, rb) \ | ||||
@@ -323,7 +323,7 @@ static inline av_pure int ff_get_fourcc(const char *s){ | |||||
}\ | }\ | ||||
} | } | ||||
#if defined(ARCH_X86) || defined(ARCH_POWERPC) || defined(ARCH_BFIN) | |||||
#if defined(ARCH_X86) || defined(ARCH_PPC) || defined(ARCH_BFIN) | |||||
#define AV_READ_TIME read_time | #define AV_READ_TIME read_time | ||||
#if defined(ARCH_X86) | #if defined(ARCH_X86) | ||||
static inline uint64_t read_time(void) | static inline uint64_t read_time(void) | ||||