# HG changeset patch # User diego # Date 1164187216 0 # Node ID ef1d382309e5389b64cb8908f050e5bf64ae3008 # Parent 43ebe9279fa0b20e50ecb656f9a192fca923b0b0 Conditionally compile some of the AltiVec optimizations. diff -r 43ebe9279fa0 -r ef1d382309e5 Makefile --- a/Makefile Wed Nov 22 01:11:29 2006 +0000 +++ b/Makefile Wed Nov 22 09:20:16 2006 +0000 @@ -388,11 +388,15 @@ ppc/fft_altivec.o \ ppc/gmc_altivec.o \ ppc/fdct_altivec.o \ - ppc/h264_altivec.o \ - ppc/snow_altivec.o \ - ppc/vc1dsp_altivec.o \ ppc/float_altivec.o \ +ifeq ($(TARGET_ALTIVEC),yes) +OBJS-$(CONFIG_H264_DECODER) += ppc/h264_altivec.o +OBJS-$(CONFIG_SNOW_DECODER) += ppc/snow_altivec.o +OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o +OBJS-$(CONFIG_WMV3_DECODER) += ppc/vc1dsp_altivec.o +endif + OBJS-$(TARGET_ARCH_BFIN) += bfin/dsputil_bfin.o \ CFLAGS += $(CFLAGS-yes) diff -r 43ebe9279fa0 -r ef1d382309e5 ppc/dsputil_ppc.c --- a/ppc/dsputil_ppc.c Wed Nov 22 01:11:29 2006 +0000 +++ b/ppc/dsputil_ppc.c Wed Nov 22 09:20:16 2006 +0000 @@ -274,14 +274,15 @@ } #ifdef HAVE_ALTIVEC - dsputil_h264_init_ppc(c, avctx); + if(ENABLE_H264_DECODER) dsputil_h264_init_ppc(c, avctx); if (has_altivec()) { mm_flags |= MM_ALTIVEC; dsputil_init_altivec(c, avctx); - snow_init_altivec(c, avctx); - vc1dsp_init_altivec(c, avctx); + if(ENABLE_SNOW_DECODER) snow_init_altivec(c, avctx); + if(ENABLE_VC1_DECODER || ENABLE_WMV3_DECODER) + vc1dsp_init_altivec(c, avctx); float_init_altivec(c, avctx); c->gmc1 = gmc1_altivec;