From 6efe80f2b3c75b3782a1f408da0d53331a6eff73 Mon Sep 17 00:00:00 2001 From: Andre Pang Date: Mon, 8 Nov 2004 05:39:54 +0000 Subject: Fix compilation on Mac OS X with --disable-altivec (warning: compilation has been tested, whether it works hasn't been tested ...) CVS patchset: 7109 CVS date: 2004/11/08 05:39:54 --- src/libmpeg2/motion_comp_altivec.c | 4 ++++ src/libmpeg2/mpeg2_internal.h | 7 +++++++ 2 files changed, 11 insertions(+) (limited to 'src') diff --git a/src/libmpeg2/motion_comp_altivec.c b/src/libmpeg2/motion_comp_altivec.c index 15adc5798..99719b7fb 100644 --- a/src/libmpeg2/motion_comp_altivec.c +++ b/src/libmpeg2/motion_comp_altivec.c @@ -1069,6 +1069,8 @@ MPEG2_MC_EXTERN (altivec) #else /* HOST_OS_DARWIN */ +#ifdef ENABLE_ALTIVEC + #include "mpeg2_internal.h" #define vector_s16_t vector signed short @@ -2023,5 +2025,7 @@ void MC_avg_xy_8_altivec (unsigned char * dest, unsigned char * ref, MPEG2_MC_EXTERN (altivec) +#endif /* ENABLE_ALTIVEC */ + #endif /* HOST_OS_DARWIN */ diff --git a/src/libmpeg2/mpeg2_internal.h b/src/libmpeg2/mpeg2_internal.h index f279cd626..cb00a830b 100644 --- a/src/libmpeg2/mpeg2_internal.h +++ b/src/libmpeg2/mpeg2_internal.h @@ -243,10 +243,17 @@ void mpeg2_idct_mmx_init (void); void mpeg2_idct_copy_altivec (int16_t * block, uint8_t * dest, int stride); void mpeg2_idct_add_altivec (int16_t * block, uint8_t * dest, int stride); #else /* HOST_OS_DARWIN */ +# ifdef ENABLE_ALTIVEC void mpeg2_idct_copy_altivec (vector signed short * block, unsigned char * dest, int stride); void mpeg2_idct_add_altivec (vector signed short * block, unsigned char * dest, int stride); +# else /* ! ENABLE_ALTIVEC */ +void mpeg2_idct_copy_altivec (signed short * block, unsigned char * dest, + int stride); +void mpeg2_idct_add_altivec (signed short * block, unsigned char * dest, + int stride); +# endif /* ENABLE_ALTIVEC */ #endif /* HOST_OS_DARWIN */ void mpeg2_idct_altivec_init (void); -- cgit v1.2.3