diff options
| author | Luca Abeni <lucabe72@email.it> | 2006-07-26 13:19:02 +0000 |
|---|---|---|
| committer | Luca Abeni <lucabe72@email.it> | 2006-07-26 13:19:02 +0000 |
| commit | 6f209cb54994160ed90f9c07033bbddef05064bc (patch) | |
| tree | 9fe8b2b9638189c40974149fda97aa7f8106f9b6 /libswscale/swscale_altivec_template.c | |
| parent | 538389c9817f3cafc27bdd606bc9b6b195964a3d (diff) | |
| download | ffmpeg-6f209cb54994160ed90f9c07033bbddef05064bc.tar.gz | |
Replace MIN() and MAX() with FFMIN() and FFMAX()
Originally committed as revision 19186 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
Diffstat (limited to 'libswscale/swscale_altivec_template.c')
| -rw-r--r-- | libswscale/swscale_altivec_template.c | 12 |
1 files changed, 6 insertions, 6 deletions
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 <romain@dolbeau.org> @@ -223,7 +223,7 @@ static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int for(j=0; j<filterSize; j++) { val += ((int)src[srcPos + j])*filter[filterSize*i + j]; } - dst[i] = MIN(MAX(0, val>>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); } } |