Module: libav Branch: master Commit: a2b51fe87c49c3ce21c4ae3310be234a9f87795c
Author: Michael Niedermayer <[email protected]> Committer: Martin Storsjö <[email protected]> Date: Wed Nov 16 17:15:15 2011 +0100 cinepak: simplify, use FFMIN() Signed-off-by: Michael Niedermayer <[email protected]> Signed-off-by: Martin Storsjö <[email protected]> --- libavcodec/cinepak.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index 0dbdeab..c6edfe6 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) _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
