diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-05-23 23:43:00 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-05-23 23:43:00 +0200 |
| commit | 37f4983b76f90efb4e5715f3eca693daf668310a (patch) | |
| tree | 0b374d0f89f92d31191dc75b43ff35c2d2e5712a /src/demuxers | |
| parent | 157f5234c463abe1b23a2f86dd182f40f99020fe (diff) | |
| download | xine-lib-37f4983b76f90efb4e5715f3eca693daf668310a.tar.gz xine-lib-37f4983b76f90efb4e5715f3eca693daf668310a.tar.bz2 | |
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.
Diffstat (limited to 'src/demuxers')
| -rw-r--r-- | src/demuxers/demux_matroska.c | 7 | ||||
| -rw-r--r-- | src/demuxers/demux_ts.c | 3 |
2 files changed, 0 insertions, 10 deletions
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 |