put MIN/MAX under ifndef MAX/MIN

Originally committed as revision 1138 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Michael Niedermayer 22 years ago
parent 6a70098ac6
commit 75460b0ce5
  1. 10
      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 ...)

Loading…
Cancel
Save