summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-13 11:37:59 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-13 11:37:59 +0000
commit0636ab5f58f91ea952d955389bcca64e0490eb85 (patch)
tree65fe99595ba32015d056489e0c87bff7614c8229 /libmpdemux
parente52420a9fe15da63c1ebb60c540c56f8e716ef0f (diff)
downloadmpv-0636ab5f58f91ea952d955389bcca64e0490eb85.tar.bz2
mpv-0636ab5f58f91ea952d955389bcca64e0490eb85.tar.xz
Simplify
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21901 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_gif.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c
index 7aa09c1254..e36514bb8b 100644
--- a/libmpdemux/demux_gif.c
+++ b/libmpdemux/demux_gif.c
@@ -120,8 +120,7 @@ static int demux_gif_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds)
{
int y;
- int cnt = effective_map->ColorCount;
- if (cnt > 256) cnt = 256;
+ int cnt = FFMIN(effective_map->ColorCount, 256);
int l = FFMIN(gif->Image.Left, priv->w);
int t = FFMIN(gif->Image.Top, priv->h);
int w = FFMIN(gif->Image.Width, priv->w - l);