aboutsummaryrefslogtreecommitdiffhomepage
path: root/libmpdemux
diff options
context:
space:
mode:
authorGravatar diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-11 15:28:54 +0000
committerGravatar diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-11 15:28:54 +0000
commit155d28bf0189ec21889678b2705c428d1b84d6da (patch)
tree3704659db779ff6ee68222d47b1d4c1a353a8aef /libmpdemux
parent33db247ee5ff6503098b133c3fae94c576e7ec7b (diff)
Remove duplicate min/max macro definition.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20159 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/muxer_mpeg.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c
index 7de7dce93b..7bf3681dc2 100644
--- a/libmpdemux/muxer_mpeg.c
+++ b/libmpdemux/muxer_mpeg.c
@@ -1335,10 +1335,6 @@ static void patch_panscan(muxer_priv_t *priv, unsigned char *buf)
}
-#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;