cinepak: simplify, use FFMIN()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Martin Storsjö <martin@martin.st>

cinepak: simplify, use FFMIN()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Martin Storsjö <martin@martin.st>
a2b51fe8 · Michael Niedermayer · Martin Storsjö · b55aa7df · a2b51fe8
Commit a2b51fe8 authored Nov 16, 2011 by Michael Niedermayer Committed by Martin Storsjö Nov 18, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

cinepak.c libavcodec/cinepak.c +1 -2

No files found.
--- 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)