Remove pointless HAVE_ALTIVEC #ifdefs from a file that only contains AltiVec
authorDiego Biurrun <diego@biurrun.de>
Tue, 2 Oct 2007 10:22:22 +0000 (10:22 +0000)
committerDiego Biurrun <diego@biurrun.de>
Tue, 2 Oct 2007 10:22:22 +0000 (10:22 +0000)
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

libavcodec/Makefile
libavcodec/ppc/mpegvideo_ppc.c

index 1770260..a41dd8f 100644 (file)
@@ -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
index 1499814..3aa3664 100644 (file)
 #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 */
-    }
 }