Mercurial > libavcodec.hg

diff common.h @ 847:f3c369b8ddca libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reversing header game MIN/MAX -> FFMIN/FFMAX
author michaelni
date Sun, 10 Nov 2002 11:46:59 +0000
parents 4c22dcf3ba65
children 058194d7ade6
line wrap: on
line diff
--- a/common.h	Sun Nov 10 11:24:27 2002 +0000
+++ b/common.h	Sun Nov 10 11:46:59 2002 +0000
@@ -161,13 +161,8 @@
 #define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b))
 #define ABS(a) ((a) >= 0 ? (a) : (-(a)))
 
-#ifndef MAX
-#    define MAX(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
-#ifndef MIN
-#    define MIN(a,b) ((a) > (b) ? (b) : (a))
-#endif
+#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
+#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
 
 #ifdef ARCH_X86
 // avoid +32 for shift optimization (gcc should do that ...)