From 6caf5586eeb00b45190ceaeff270e6850598e87c Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 9 Dec 2006 12:24:11 +0000 Subject: 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 --- libmpdemux/aviheader.h | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'libmpdemux/aviheader.h') 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 ) | \ -- cgit v1.2.3