summaryrefslogtreecommitdiff
path: root/libavcodec/cinepak.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-16 17:15:15 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-16 20:45:11 +0100
commit111ffa55b7e6e7a4fcee5b93e4e416b75f704fb4 (patch)
treeebf2b4621829b387da755bc04c3a047b251788c7 /libavcodec/cinepak.c
parent69a501e6a1a5cbd6fd47ad09a6e0f9edad5d5b7b (diff)
cinepak: simplify, use FFMIN()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cinepak.c')
-rw-r--r--libavcodec/cinepak.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index 9069b7e390..68ffe5c687 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);
s->frame.key_frame = 0;