diff options
| author | Luca Abeni <lucabe72@email.it> | 2006-07-26 13:19:02 +0000 |
|---|---|---|
| committer | Luca Abeni <lucabe72@email.it> | 2006-07-26 13:19:02 +0000 |
| commit | 6f209cb54994160ed90f9c07033bbddef05064bc (patch) | |
| tree | 9fe8b2b9638189c40974149fda97aa7f8106f9b6 /libswscale/swscale_template.c | |
| parent | 538389c9817f3cafc27bdd606bc9b6b195964a3d (diff) | |
| download | ffmpeg-6f209cb54994160ed90f9c07033bbddef05064bc.tar.gz | |
Replace MIN() and MAX() with FFMIN() and FFMAX()
Originally committed as revision 19186 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
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 |