Mercurial > mplayer.hg

diff libmpdemux/muxer_mpeg.c @ 20153:b9c036c1a7e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove duplicate min/max macro definition.
author diego
date Wed, 11 Oct 2006 15:28:54 +0000
parents b79f65f98553
children 5ccb2b837b1c
line wrap: on
line diff
--- a/libmpdemux/muxer_mpeg.c	Wed Oct 11 14:12:17 2006 +0000
+++ b/libmpdemux/muxer_mpeg.c	Wed Oct 11 15:28:54 2006 +0000
@@ -1335,10 +1335,6 @@
 }
 
 
-#define max(a, b) ((a) >= (b) ? (a) : (b))
-#define min(a, b) ((a) <= (b) ? (a) : (b))
-
-
 static void update_scr(muxer_t *muxer)
 {
 	muxer_priv_t *priv = muxer->priv;