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 /libmpdemux/demux_gif.c | |
| 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 'libmpdemux/demux_gif.c')
| -rw-r--r-- | libmpdemux/demux_gif.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c index bdd8860abf..f23144a0a3 100644 --- a/libmpdemux/demux_gif.c +++ b/libmpdemux/demux_gif.c @@ -160,10 +160,10 @@ static int demux_gif_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) { int y; int cnt = FFMIN(effective_map->ColorCount, 256); - int l = FFMAX(FFMIN(gif->Image.Left, priv->w), 0); - int t = FFMAX(FFMIN(gif->Image.Top, priv->h), 0); - int w = FFMAX(FFMIN(gif->Image.Width, priv->w - l), 0); - int h = FFMAX(FFMIN(gif->Image.Height, priv->h - t), 0); + int l = av_clip(gif->Image.Left, 0, priv->w); + int t = av_clip(gif->Image.Top, 0, priv->h); + int w = av_clip(gif->Image.Width, 0, priv->w - l); + int h = av_clip(gif->Image.Height, 0, priv->h - t); unsigned char *dest = dp->buffer + priv->w * t + l; // copy the palette |