diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-09-17 08:59:36 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:16:55 +0200 |
| commit | 21ea779e7aa2b819b9082320d1fcf9eaa0024a37 (patch) | |
| tree | 1d5778de7aadf9a9d3cc4bbc5a74499a551bcd3c /libvo/vo_directfb2.c | |
| parent | e25bc291435045090283c5255904d151dead2cb2 (diff) | |
| download | mpv-21ea779e7aa2b819b9082320d1fcf9eaa0024a37.tar.bz2 mpv-21ea779e7aa2b819b9082320d1fcf9eaa0024a37.tar.xz | |
vo_vesa, vo_directfb2: Replace local min/max macros by FFMIN/FFMAX
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32282 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_directfb2.c')
| -rw-r--r-- | libvo/vo_directfb2.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c index 3771f3d6a9..1fb5577075 100644 --- a/libvo/vo_directfb2.c +++ b/libvo/vo_directfb2.c @@ -27,6 +27,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <libavutil/common.h> #include "config.h" #include "video_out.h" @@ -38,10 +39,6 @@ #include "subopt-helper.h" #include "mp_fifo.h" -#ifndef min -#define min(x,y) (((x)<(y))?(x):(y)) -#endif - // triple buffering #define TRIPLE 1 @@ -1183,7 +1180,7 @@ static int draw_slice(uint8_t *src[], int stride[], int w, int h, int x, int y) primarylocked = 1; }; - p=min(w,pitch); + p = FFMIN(w, pitch); dst += y*pitch + x; dst2 = dst + pitch*height - y*pitch + y*pitch/4 - x/2; @@ -1279,7 +1276,7 @@ static uint32_t put_image(mp_image_t *mpi){ primarylocked = 1; }; - p=min(mpi->w,pitch); + p = FFMIN(mpi->w, pitch); src = mpi->planes[0]+mpi->y*mpi->stride[0]+mpi->x; |