From 37f4983b76f90efb4e5715f3eca693daf668310a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Fri, 23 May 2008 23:43:00 +0200 Subject: Remove MIN/MAX macro definitions on unit. Now that the macro are either imported from the system or defined by configure. don't define them in every source file. --- src/demuxers/demux_matroska.c | 7 ------- src/demuxers/demux_ts.c | 3 --- 2 files changed, 10 deletions(-) (limited to 'src/demuxers') diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index b05128fec..5faebf61d 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -58,13 +58,6 @@ #define WRAP_THRESHOLD 90000 -#if !defined(MIN) -#define MIN(a, b) ((a)<(b)?(a):(b)) -#endif -#if !defined(MAX) -#define MAX(a, b) ((a)>(b)?(a):(b)) -#endif - typedef struct { int track_num; off_t *pos; diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index 6d854e4c3..5ccdd20de 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -185,9 +185,6 @@ #define INVALID_PROGRAM ((unsigned int)(-1)) #define INVALID_CC ((unsigned int)(-1)) -#define MIN(a,b) (((a)<(b))?(a):(b)) -#define MAX(a,b) (((a)>(b))?(a):(b)) - #define PROG_STREAM_MAP 0xBC #define PRIVATE_STREAM1 0xBD #define PADDING_STREAM 0xBE -- cgit v1.2.3