diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-01 12:54:08 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-01 12:54:08 +0000 |
commit | 8e7945155c8d3e02d69afe2686fbaa9f66b8aef7 (patch) | |
tree | e0db603ce4689be600381763d3b6bd2a23dae36b /libmpcodecs | |
parent | 7e316c542e314efd7d24909e02215a1da40e757c (diff) | |
download | mpv-8e7945155c8d3e02d69afe2686fbaa9f66b8aef7.tar.bz2 mpv-8e7945155c8d3e02d69afe2686fbaa9f66b8aef7.tar.xz |
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
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/vf_bmovl.c | 11 | ||||
-rw-r--r-- | libmpcodecs/vf_unsharp.c | 12 |
2 files changed, 8 insertions, 15 deletions
diff --git a/libmpcodecs/vf_bmovl.c b/libmpcodecs/vf_bmovl.c index 60a5d5770c..f8715821f6 100644 --- a/libmpcodecs/vf_bmovl.c +++ b/libmpcodecs/vf_bmovl.c @@ -71,6 +71,7 @@ #ifndef HAVE_NO_POSIX_SELECT #include "mp_msg.h" +#include "libavutil/common.h" #include "libvo/fastmemcpy.h" @@ -89,8 +90,6 @@ #define TRUE 1 #define FALSE 0 -#define MAX(a,b) ((a) > (b) ? (a) : (b)) -#define MIN(a,b) ((a) < (b) ? (a) : (b)) #define INRANGE(a,b,c) ( ((a) < (b)) ? (b) : ( ((a) > (c)) ? (c) : (a) ) ) #define rgb2y(R,G,B) ( (( 263*R + 516*G + 100*B) >> 10) + 16 ) @@ -298,10 +297,10 @@ put_image(struct vf_instance_s* vf, mp_image_t* mpi, double pts){ vf->priv->x2 = vf->priv->y2 = 0; } // Define how much of our bitmap that contains graphics! - vf->priv->x1 = MAX( 0, MIN(vf->priv->x1, imgx) ); - vf->priv->y1 = MAX( 0, MIN(vf->priv->y1, imgy) ); - vf->priv->x2 = MIN( vf->priv->w, MAX(vf->priv->x2, ( imgx + imgw)) ); - vf->priv->y2 = MIN( vf->priv->h, MAX(vf->priv->y2, ( imgy + imgh)) ); + vf->priv->x1 = av_clip(imgx, 0, vf->priv->x1); + vf->priv->y1 = av_clip(imgy, 0, vf->priv->y1); + vf->priv->x2 = av_clip(imgx + imgw, vf->priv->x2, vf->priv->w); + vf->priv->y2 = av_clip(imgy + imgh, vf->priv->y2, vf->priv->h); } if( command == CMD_CLEAR ) { 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+1<max ) ? atoi( pos=z+1 ) : fp->msizeX; // 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, ':' ); |