Mercurial > libavcodec.hg
diff common.h @ 823:5344ecb2c677 libavcodec
put MIN/MAX under ifndef MAX/MIN
author | michaelni |
---|---|
date | Fri, 01 Nov 2002 20:37:10 +0000 |
parents | 8e1f0939d15d |
children | 4c22dcf3ba65 |
line wrap: on
line diff
--- a/common.h Fri Nov 01 18:55:03 2002 +0000 +++ b/common.h Fri Nov 01 20:37:10 2002 +0000 @@ -162,8 +162,14 @@ /* assume b>0 */ #define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b)) #define ABS(a) ((a) >= 0 ? (a) : (-(a))) -#define MAX(a,b) ((a) > (b) ? (a) : (b)) -#define MIN(a,b) ((a) > (b) ? (b) : (a)) + +#ifndef MAX +# define MAX(a,b) ((a) > (b) ? (a) : (b)) +#endif + +#ifndef MIN +# define MIN(a,b) ((a) > (b) ? (b) : (a)) +#endif #ifdef ARCH_X86 // avoid +32 for shift optimization (gcc should do that ...)