From 8e7945155c8d3e02d69afe2686fbaa9f66b8aef7 Mon Sep 17 00:00:00 2001 From: reimar Date: Thu, 1 Mar 2007 12:54:08 +0000 Subject: Use libavutil's av_clip* instead of unreadable MIN/MAX chaos. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22395 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vf_unsharp.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'libmpcodecs/vf_unsharp.c') diff --git a/libmpcodecs/vf_unsharp.c b/libmpcodecs/vf_unsharp.c index 13a2f6e13f..e9506083c3 100644 --- a/libmpcodecs/vf_unsharp.c +++ b/libmpcodecs/vf_unsharp.c @@ -35,13 +35,7 @@ #include "mp_image.h" #include "vf.h" #include "libvo/fastmemcpy.h" - -#ifndef MIN -#define MIN(a,b) (((a)<(b))?(a):(b)) -#endif -#ifndef MAX -#define MAX(a,b) (((a)>(b))?(a):(b)) -#endif +#include "libavutil/common.h" //===========================================================================// @@ -258,8 +252,8 @@ static void parse( FilterParam *fp, char* args ) { fp->msizeY = ( z && z+1msizeX; // min/max & odd - fp->msizeX = 1 | MIN( MAX( fp->msizeX, MIN_MATRIX_SIZE ), MAX_MATRIX_SIZE ); - fp->msizeY = 1 | MIN( MAX( fp->msizeY, MIN_MATRIX_SIZE ), MAX_MATRIX_SIZE ); + fp->msizeX = 1 | av_clip(fp->msizeX, MIN_MATRIX_SIZE, MAX_MATRIX_SIZE); + fp->msizeY = 1 | av_clip(fp->msizeY, MIN_MATRIX_SIZE, MAX_MATRIX_SIZE); // parse amount pos = strchr( pos+1, ':' ); -- cgit v1.2.3