diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-11-01 20:37:10 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-11-01 20:37:10 +0000 |
| commit | 75460b0ce5d7b23699799bd11b3bb6a516cb4f8e (patch) | |
| tree | efbeb68a26b50e675e3a65694e50f83b61fbbfd9 /libavcodec/common.h | |
| parent | 6a70098ac618fa7990c621940ad48da06164257a (diff) | |
| download | ffmpeg-75460b0ce5d7b23699799bd11b3bb6a516cb4f8e.tar.gz | |
put MIN/MAX under ifndef MAX/MIN
Originally committed as revision 1138 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/common.h')
| -rw-r--r-- | libavcodec/common.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/common.h b/libavcodec/common.h index ce26697816..1f9f8a2d57 100644 --- a/libavcodec/common.h +++ b/libavcodec/common.h @@ -162,8 +162,14 @@ inline void dprintf(const char* fmt,...) {} /* 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 ...) |