diff libswscale/swscale_altivec_template.c @ 19181:e40cf0305d4e

Replace MIN() and MAX() with FFMIN() and FFMAX()
author lucabe
date Wed, 26 Jul 2006 13:19:02 +0000
parents 8579acff875e
children 07769a1d06a9
line wrap: on
line diff
--- a/libswscale/swscale_altivec_template.c	Wed Jul 26 09:30:43 2006 +0000
+++ b/libswscale/swscale_altivec_template.c	Wed Jul 26 13:19:02 2006 +0000
@@ -1,4 +1,4 @@
-/*
+FF/*
   AltiVec-enhanced yuv2yuvX
 
     Copyright (C) 2004 Romain Dolbeau <romain@dolbeau.org>
@@ -223,7 +223,7 @@
       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 @@
 	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 @@
 	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 @@
 	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 @@
         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);        
       }
       
     }