]> git.sesse.net Git - ffmpeg/commitdiff
cinepak: simplify, use FFMIN()
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Nov 2011 16:15:15 +0000 (17:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Nov 2011 19:45:11 +0000 (20:45 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/cinepak.c

index 9069b7e3900a1a02be3266d56370ef5e9d7b1825..68ffe5c6877a4dcd218345d24707a31bd9129eb8 100644 (file)
@@ -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);
 
     s->frame.key_frame = 0;