Mercurial > mplayer.hg

changeset 12845:5c83c247bad1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
no redefinition, clashes with OpenBSD
author alex
date Sun, 18 Jul 2004 04:23:38 +0000
parents d466d97bfe8d
children 72f645fb0c40
files libmpdemux/realrtsp/real.c
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/realrtsp/real.c	Sat Jul 17 14:44:06 2004 +0000
+++ b/libmpdemux/realrtsp/real.c	Sun Jul 18 04:23:38 2004 +0000
@@ -55,7 +55,9 @@
 
 #define BE_32(x)  be2me_32(*(uint32_t*)(x))
 
+#ifndef MAX
 #define MAX(x,y) ((x>y) ? x : y)
+#endif
 
 #ifdef LOG
 static void hexdump (const char *buf, int length) {