Skip to content

V
vlc-2-2
Commit ba5c0ebe authored by Christophe Massiot's avatar Christophe Massiot
Browse files
Options

Fixed dumb renaming of #define's for altivec :-p.

parent beb815f0
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
plugins/idct/idctaltivec.c
View file @ ba5c0ebe
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* idctaltivec.c : Altivec IDCT module * idctaltivec.c : Altivec IDCT module
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: idctaltivec.c,v 1.19 2001/11/28 15:08:05 massiot Exp $ * $Id: idctaltivec.c,v 1.20 2001/12/06 13:46:23 massiot Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -122,7 +122,7 @@ static void InitIDCT( void ** pp_idct_data ) ...@@ -122,7 +122,7 @@ static void InitIDCT( void ** pp_idct_data )
* IDCT in Altivec * IDCT in Altivec
*****************************************************************************/ *****************************************************************************/
#ifndef HAVE_C_ALTIVEC #ifndef CAN_COMPILE_C_ALTIVEC
static int16_t constants[5][8] ATTR_ALIGN(16) = { static int16_t constants[5][8] ATTR_ALIGN(16) = {
{23170, 13573, 6518, 21895, -23170, -21895, 32, 31}, {23170, 13573, 6518, 21895, -23170, -21895, 32, 31},
...@@ -558,11 +558,11 @@ void idct_block_add_altivec (int16_t * block, uint8_t * dest, int stride) ...@@ -558,11 +558,11 @@ void idct_block_add_altivec (int16_t * block, uint8_t * dest, int stride)
); );
} }
#endif /* !HAVE_C_ALTIVEC */ #endif /* !CAN_COMPILE_C_ALTIVEC */
#endif /* __BUILD_ALTIVEC_ASM__ */ #endif /* __BUILD_ALTIVEC_ASM__ */
#if defined(HAVE_C_ALTIVEC) || defined(__BUILD_ALTIVEC_ASM__) #if defined(CAN_COMPILE_C_ALTIVEC) || defined(__BUILD_ALTIVEC_ASM__)
#define vector_s16_t vector signed short #define vector_s16_t vector signed short
#define vector_u16_t vector unsigned short #define vector_u16_t vector unsigned short
...@@ -740,7 +740,7 @@ void idct_block_add_altivec (vector_s16_t * block, unsigned char * dest, ...@@ -740,7 +740,7 @@ void idct_block_add_altivec (vector_s16_t * block, unsigned char * dest,
ADD (dest, vx7, perm1) ADD (dest, vx7, perm1)
} }
#endif /* __BUILD_ALTIVEC_ASM__ || HAVE_C_ALTIVEC */ #endif /* __BUILD_ALTIVEC_ASM__ || CAN_COMPILE_C_ALTIVEC */
#ifndef __BUILD_ALTIVEC_ASM__ #ifndef __BUILD_ALTIVEC_ASM__
......
plugins/motion/motionaltivec.c
View file @ ba5c0ebe
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* motionaltivec.c : Altivec motion compensation module for vlc * motionaltivec.c : Altivec motion compensation module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: motionaltivec.c,v 1.6 2001/11/28 15:08:05 massiot Exp $ * $Id: motionaltivec.c,v 1.7 2001/12/06 13:46:23 massiot Exp $
* *
* Authors: Michel Lespinasse <walken@zoy.org> * Authors: Michel Lespinasse <walken@zoy.org>
* Paul Mackerras <paulus@linuxcare.com.au> * Paul Mackerras <paulus@linuxcare.com.au>
...@@ -95,7 +95,7 @@ static int motion_Probe( probedata_t *p_data ) ...@@ -95,7 +95,7 @@ static int motion_Probe( probedata_t *p_data )
* Motion compensation in Altivec * Motion compensation in Altivec
*****************************************************************************/ *****************************************************************************/
#ifndef HAVE_C_ALTIVEC #ifndef CAN_COMPILE_C_ALTIVEC
/* /*
* The asm code is generated with: * The asm code is generated with:
...@@ -1129,10 +1129,10 @@ static void MC_avg_xy_8_altivec (uint8_t * dest, uint8_t * ref, ...@@ -1129,10 +1129,10 @@ static void MC_avg_xy_8_altivec (uint8_t * dest, uint8_t * ref,
); );
} }
#endif /* !HAVE_C_ALTIVEC */ #endif /* !CAN_COMPILE_C_ALTIVEC */
#endif /* __BUILD_ALTIVEC_ASM__ */ #endif /* __BUILD_ALTIVEC_ASM__ */
#if defined(HAVE_C_ALTIVEC) || defined(__BUILD_ALTIVEC_ASM__) #if defined(CAN_COMPILE_C_ALTIVEC) || defined(__BUILD_ALTIVEC_ASM__)
#define vector_s16_t vector signed short #define vector_s16_t vector signed short
#define vector_u16_t vector unsigned short #define vector_u16_t vector unsigned short
...@@ -2084,7 +2084,7 @@ void MC_avg_xy_8_altivec (unsigned char * dest, unsigned char * ref, ...@@ -2084,7 +2084,7 @@ void MC_avg_xy_8_altivec (unsigned char * dest, unsigned char * ref,
vec_ste ((vector_u32_t)tmp, 4, (unsigned int *)dest); vec_ste ((vector_u32_t)tmp, 4, (unsigned int *)dest);
} }
#endif /* HAVE_C_ALTIVEC || __BUILD_ALTIVEC_ASM__ */ #endif /* CAN_COMPILE_C_ALTIVEC || __BUILD_ALTIVEC_ASM__ */
#ifndef __BUILD_ALTIVEC_ASM__ #ifndef __BUILD_ALTIVEC_ASM__
/***************************************************************************** /*****************************************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment