diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-10-02 10:22:22 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-10-02 10:22:22 +0000 |
| commit | 465c9fdeebe32de6de0d68a869d971e704e95704 (patch) | |
| tree | 449b6b749daadb7a88b6eeb53cfa3ee35db7563b | |
| parent | 3303926c2f06841270281e7f5210c0c94292e089 (diff) | |
| download | ffmpeg-465c9fdeebe32de6de0d68a869d971e704e95704.tar.gz | |
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
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/ppc/mpegvideo_ppc.c | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1770260d3f..a41dd8f53c 100644 --- 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 1499814ff8..3aa366482b 100644 --- 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 */ - } } |