diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-07-18 04:23:38 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-07-18 04:23:38 +0000 |
| commit | 7de9985f13eb453c2cbf77e67d0db9a2a65e142e (patch) | |
| tree | b49bd49a752e99dc3d85d424a692d5f5bbd6501e /libmpdemux | |
| parent | 3f68ffdbcb01aaff3592f6b29c0245ccf06af393 (diff) | |
| download | mpv-7de9985f13eb453c2cbf77e67d0db9a2a65e142e.tar.bz2 mpv-7de9985f13eb453c2cbf77e67d0db9a2a65e142e.tar.xz | |
no redefinition, clashes with OpenBSD
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12846 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/realrtsp/real.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpdemux/realrtsp/real.c b/libmpdemux/realrtsp/real.c index 0e88f7442b..7e023ba961 100644 --- a/libmpdemux/realrtsp/real.c +++ b/libmpdemux/realrtsp/real.c @@ -55,7 +55,9 @@ const unsigned char xor_table[] = { #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) { |