diff options
| author | lucabe <lucabe@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-26 13:19:02 +0000 |
|---|---|---|
| committer | lucabe <lucabe@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-26 13:19:02 +0000 |
| commit | 134140b1c22e4968d46148a954125fb4408841c9 (patch) | |
| tree | e7f6b84a74ecfb9e5e2152ce76d20b5c536dccc5 /libswscale/swscale_template.c | |
| parent | 76590563aa8b305ce539273f99a7e93c3a0dc561 (diff) | |
| download | mpv-134140b1c22e4968d46148a954125fb4408841c9.tar.bz2 mpv-134140b1c22e4968d46148a954125fb4408841c9.tar.xz | |
Replace MIN() and MAX() with FFMIN() and FFMAX()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19186 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libswscale/swscale_template.c')
| -rw-r--r-- | libswscale/swscale_template.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |