From 134140b1c22e4968d46148a954125fb4408841c9 Mon Sep 17 00:00:00 2001 From: lucabe Date: Wed, 26 Jul 2006 13:19:02 +0000 Subject: Replace MIN() and MAX() with FFMIN() and FFMAX() git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19186 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/swscale_altivec_template.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libswscale/swscale_altivec_template.c') diff --git a/libswscale/swscale_altivec_template.c b/libswscale/swscale_altivec_template.c index d4a38201f1..a19888ccd3 100644 --- a/libswscale/swscale_altivec_template.c +++ b/libswscale/swscale_altivec_template.c @@ -1,4 +1,4 @@ -/* +FF/* AltiVec-enhanced yuv2yuvX Copyright (C) 2004 Romain Dolbeau @@ -223,7 +223,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int for(j=0; j>7), (1<<15)-1); + dst[i] = FFMIN(FFMAX(0, val>>7), (1<<15)-1); } } else @@ -261,7 +261,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int vector signed int val_vEven = vec_mule(src_v, filter_v); vector signed int val_s = vec_sums(val_vEven, vzero); vec_st(val_s, 0, tempo); - dst[i] = MIN(MAX(0, tempo[3]>>7), (1<<15)-1); + dst[i] = FFMIN(FFMAX(0, tempo[3]>>7), (1<<15)-1); } } break; @@ -286,7 +286,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int vector signed int val_v = vec_msums(src_v, filter_v, (vector signed int)vzero); vector signed int val_s = vec_sums(val_v, vzero); vec_st(val_s, 0, tempo); - dst[i] = MIN(MAX(0, tempo[3]>>7), (1<<15)-1); + dst[i] = FFMIN(FFMAX(0, tempo[3]>>7), (1<<15)-1); } } break; @@ -315,7 +315,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int vector signed int val_s = vec_sums(val_v, vzero); vec_st(val_s, 0, tempo); - dst[i] = MIN(MAX(0, tempo[3]>>7), (1<<15)-1); + dst[i] = FFMIN(FFMAX(0, tempo[3]>>7), (1<<15)-1); } } break; @@ -376,7 +376,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int vector signed int val_s = vec_sums(val_v, vzero); vec_st(val_s, 0, tempo); - dst[i] = MIN(MAX(0, tempo[3]>>7), (1<<15)-1); + dst[i] = FFMIN(FFMAX(0, tempo[3]>>7), (1<<15)-1); } } -- cgit v1.2.3