From 134140b1c22e4968d46148a954125fb4408841c9 Mon Sep 17 00:00:00 2001 From: lucabe Date: Wed, 26 Jul 2006 13:19:02 +0000 Subject: Replace MIN() and MAX() with FFMIN() and FFMAX() git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19186 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/swscale_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libswscale/swscale_template.c') diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c index afb431813e..8588820a64 100644 --- a/libswscale/swscale_template.c +++ b/libswscale/swscale_template.c @@ -2405,7 +2405,7 @@ static inline void RENAME(hScale)(int16_t *dst, int dstW, uint8_t *src, int srcW val += ((int)src[srcPos + j])*filter[filterSize*i + j]; } // filter += hFilterSize; - dst[i] = MIN(MAX(0, val>>7), (1<<15)-1); // the cubic equation does overflow ... + dst[i] = FFMIN(FFMAX(0, val>>7), (1<<15)-1); // the cubic equation does overflow ... // dst[i] = val>>7; } #endif -- cgit v1.2.3