From a2b51fe87c49c3ce21c4ae3310be234a9f87795c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 16 Nov 2011 17:15:15 +0100 Subject: [PATCH] cinepak: simplify, use FFMIN() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Niedermayer Signed-off-by: Martin Storsjö --- libavcodec/cinepak.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index 0dbdeab354..c6edfe6cc9 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -357,8 +357,7 @@ static int cinepak_decode (CinepakContext *s) s->data += 10 + s->sega_film_skip_bytes; - if (num_strips > MAX_STRIPS) - num_strips = MAX_STRIPS; + num_strips = FFMIN(num_strips, MAX_STRIPS); for (i=0; i < num_strips; i++) { if ((s->data + 12) > eod)