fixed some bugs in app parser - some jfif and adobe jpgs fixed

[ffmpeg] / libavcodec / common.h

diff --git a/libavcodec/common.h b/libavcodec/common.h
index ce26697816945bb01e4e98afcbe8e4efbe56ef1f..1f9f8a2d5723fd423eee715edfec970382a79e9d 100644 (file)
--- 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 ...)