* Made -DNEED_ALTIVEC unnecessary, thanks to Guillaume Poirier.

git-svn-id: svn://svn.videolan.org/x264/trunk@633 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/common/ppc/quant.c b/common/ppc/quant.c
index 66aaec71bf9220228932b36930ea5fc0fd1101d3..ccce8ef9090405ed18d1103d5e91a50316eb301f 100644 (file)
--- a/common/ppc/quant.c
+++ b/common/ppc/quant.c
@@ -18,6 +18,20 @@
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
 *****************************************************************************/
 
+#if defined SYS_LINUX
+#include <altivec.h>
+#endif
+
+typedef union {
+  unsigned int s[4];
+  vector unsigned int v;
+} vect_int_u;
+
+typedef union {
+  unsigned short s[8];
+  vector unsigned short v;
+} vect_ushort_u;
+
 #include "common/common.h"
 #include "ppccommon.h"
 #include "quant.h"            

diff --git a/common/ppc/quant.h b/common/ppc/quant.h
index 49ab01a5426fa76ca82ade78a5d1832d0f9771fc..a113c541dcf79688ad03be6e8b2c88e7131a114d 100644 (file)
--- a/common/ppc/quant.h
+++ b/common/ppc/quant.h
@@ -18,27 +18,9 @@
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
 *****************************************************************************/
 
-#if defined SYS_LINUX && defined NEED_ALTIVEC
-#include <altivec.h>
-#endif
-
 #ifndef _PPC_QUANT_H
 #define _PPC_QUANT_H 1
 
-typedef union {
-  unsigned int s[4];
-#if defined NEED_ALTIVEC
-  vector unsigned int v;
-#endif
-} vect_int_u;
-
-typedef union {
-  unsigned short s[8];
-#if defined NEED_ALTIVEC
-  vector unsigned short v;
-#endif
-} vect_ushort_u;
-
 void x264_quant_4x4_altivec( int16_t dct[4][4], int quant_mf[4][4], int const i_qbits, int const f );
 void x264_quant_8x8_altivec( int16_t dct[8][8], int quant_mf[8][8], int const i_qbits, int const f );
 

diff --git a/configure b/configure
index b903fdd3d5e6fe2997a8d24ed1669ac8f7a882d6..e594db5042f4ea1629af2acfcbfca246775c5ab2 100755 (executable)
--- a/configure
+++ b/configure
@@ -168,7 +168,6 @@ case "${MACHINE%%-*}" in
     ;;
   powerpc|powerpc64)
     ARCH="PPC"
-    ALTIVECFLAGS="$ALTIVECFLAGS -DNEED_ALTIVEC"
     if [ $SYS = MACOSX ]
     then
       ALTIVECFLAGS="$ALTIVECFLAGS -faltivec -fastf -mcpu=G4"