Remove pointless HAVE_ALTIVEC #ifdefs from a file that only contains AltiVec

optimizations and no general PPC optimizations. Instead make the file be
compiled conditional to HAVE_ALTIVEC.

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

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 1770260d3f789d3b96146c45382a6483c0fc8c2d..a41dd8f53c6145faab2adffb332a3eab36e093c1 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -394,7 +394,6 @@ ASM_OBJS-$(ARCH_ALPHA)                 += alpha/dsputil_alpha_asm.o  \
                                           alpha/motion_est_mvi_asm.o \
 
 OBJS-$(ARCH_POWERPC)                   += ppc/dsputil_ppc.o   \
-                                          ppc/mpegvideo_ppc.o \
 
 OBJS-$(HAVE_MMI)                       += ps2/dsputil_mmi.o   \
                                           ps2/idct_mmi.o      \
@@ -412,6 +411,7 @@ OBJS-$(HAVE_ALTIVEC)                   += ppc/dsputil_altivec.o      \
                                           ppc/idct_altivec.o         \
                                           ppc/int_altivec.o          \
                                           ppc/mpegvideo_altivec.o    \
+                                          ppc/mpegvideo_ppc.o        \
 
 ifeq ($(HAVE_ALTIVEC),yes)
 OBJS-$(CONFIG_H264_DECODER)            += ppc/h264_altivec.o

diff --git a/libavcodec/ppc/mpegvideo_ppc.c b/libavcodec/ppc/mpegvideo_ppc.c
index 1499814ff8bc2154744313bf504e1f1bc8d4295d..3aa366482b80beef01363c6ba3ab716dd238671c 100644 (file)
--- a/libavcodec/ppc/mpegvideo_ppc.c
+++ b/libavcodec/ppc/mpegvideo_ppc.c
@@ -21,10 +21,7 @@
 #include "dsputil.h"
 #include "mpegvideo.h"
 #include <time.h>
-
-#ifdef HAVE_ALTIVEC
 #include "dsputil_altivec.h"
-#endif
 
 extern int dct_quantize_altivec(MpegEncContext *s,
         DCTELEM *block, int n,
@@ -38,9 +35,6 @@ extern void idct_add_altivec(uint8_t *dest, int line_size, int16_t *block);
 
 void MPV_common_init_ppc(MpegEncContext *s)
 {
-#ifdef HAVE_ALTIVEC
-    if (has_altivec())
-    {
       if (s->avctx->lowres==0)
       {
         if ((s->avctx->idct_algo == FF_IDCT_AUTO) ||
@@ -78,10 +72,5 @@ void MPV_common_init_ppc(MpegEncContext *s)
             s->dct_unquantize_h263_intra = dct_unquantize_h263_altivec;
             s->dct_unquantize_h263_inter = dct_unquantize_h263_altivec;
         }
-    } else
-#endif
-    {
-        /* Non-AltiVec PPC optimisations here */
-    }
 }