Add a check for ppc4xx instructions; rename preprocessor directive accordingly.

Originally committed as revision 16756 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index dec9925d2cec22547389eb81555cb583360a1895..b5248576224b405bbbb479d4da7f3025e31ab257 100755 (executable)
--- a/configure
+++ b/configure
@@ -823,6 +823,7 @@ ARCH_EXT_LIST='
     mmx
     mmx2
     neon
+    ppc4xx
     sse
     ssse3
     vis
@@ -952,6 +953,7 @@ mmi_deps="mips"
 mmx_deps="x86"
 mmx2_deps="x86 mmx"
 neon_deps="arm"
+ppc4xx_deps="ppc"
 sse_deps="mmx"
 ssse3_deps="x86 sse"
 vis_deps="sparc"
@@ -1773,6 +1775,7 @@ fi
 # check for assembler specific support
 
 enabled ppc && check_asm dcbzl '"dcbzl 0, 1"'
+enabled ppc && check_asm ppc4xx '"maclhw r10, r11, r12"'
 
 # check for SIMD availability
 

diff --git a/libavcodec/ppc/mathops.h b/libavcodec/ppc/mathops.h
index 7553a50c458477e69674aa503ddc7c87b465ec9d..8c0eab01f1de6756fda9a8155308d43dd60aac21 100644 (file)
--- 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 ARCH_PPC_405
+#if HAVE_PPC4XX
 /* signed 16x16 -> 32 multiply add accumulate */
 #define MAC16(rt, ra, rb) \
     __asm__ ("maclhw %0, %2, %3" : "=r" (rt) : "0" (rt), "r" (ra), "r" (rb));