diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-09 12:24:11 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-09 12:24:11 +0000 |
| commit | 6caf5586eeb00b45190ceaeff270e6850598e87c (patch) | |
| tree | 2102ee89551ec703f7171ca72dfd0649dc7a358f /libmpdemux/aviheader.h | |
| parent | 134a537a76e429b16b8069e60d51ddbd4d6a0494 (diff) | |
| download | mpv-6caf5586eeb00b45190ceaeff270e6850598e87c.tar.bz2 mpv-6caf5586eeb00b45190ceaeff270e6850598e87c.tar.xz | |
Get rid of min/max macros from aviheader.h, they do not belong here.
Replace their uses by FFMIN/FFMAX
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21547 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/aviheader.h')
| -rw-r--r-- | libmpdemux/aviheader.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/libmpdemux/aviheader.h b/libmpdemux/aviheader.h index 13be07430f..e47356c97b 100644 --- a/libmpdemux/aviheader.h +++ b/libmpdemux/aviheader.h @@ -5,18 +5,6 @@ #include "libavutil/common.h" #include "mpbswap.h" -#ifndef MIN -#define MIN(a,b) (((a)<(b))?(a):(b)) -#endif - -#ifndef min -#define min(a,b) (((a)<(b))?(a):(b)) -#endif - -#ifndef max -#define max(a,b) (((a)>(b))?(a):(b)) -#endif - #ifndef mmioFOURCC #define mmioFOURCC( ch0, ch1, ch2, ch3 ) \ ( (uint32_t)(uint8_t)(ch0) | ( (uint32_t)(uint8_t)(ch1) << 8 ) | \ |