--- branches/release-1_3-branch/xvidcore/src/global.h	2011/11/09 14:12:10	2056
+++ branches/release-1_3-branch/xvidcore/src/global.h	2011/12/30 13:04:28	2057
@@ -251,8 +251,12 @@
 
 /* useful macros */
 
+#ifndef MIN
 #define MIN(X, Y) ((X)<(Y)?(X):(Y))
+#endif
+#ifndef MAX
 #define MAX(X, Y) ((X)>(Y)?(X):(Y))
+#endif
 /* #define ABS(X)    (((X)>0)?(X):-(X)) */
 #define SIGN(X)   (((X)>0)?1:-1)
 #define CLIP(X,AMIN,AMAX)   (((X)<(AMIN)) ? (AMIN) : ((X)>(AMAX)) ? (AMAX) : (X))