diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-16 17:15:15 +0100 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2011-11-18 11:36:05 +0200 |
| commit | a2b51fe87c49c3ce21c4ae3310be234a9f87795c (patch) | |
| tree | 5e585c7c7719c800d921ec45a8050e02bf066411 /libavcodec/cinepak.c | |
| parent | b55aa7df6b79746541f05d65c414961f49f46f68 (diff) | |
| download | ffmpeg-a2b51fe87c49c3ce21c4ae3310be234a9f87795c.tar.gz | |
cinepak: simplify, use FFMIN()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/cinepak.c')
| -rw-r--r-- | libavcodec/cinepak.c | 3 |
1 files changed, 1 insertions, 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) |