[FFmpeg-cvslog] cinepak: simplify, use FFMIN()

Michael Niedermayer git at videolan.org
Wed Nov 16 20:58:25 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Nov 16 17:15:15 2011 +0100| [111ffa55b7e6e7a4fcee5b93e4e416b75f704fb4] | committer: Michael Niedermayer

cinepak: simplify, use FFMIN()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=111ffa55b7e6e7a4fcee5b93e4e416b75f704fb4
---

 libavcodec/cinepak.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index 9069b7e..68ffe5c 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;
 



More information about the ffmpeg-cvslog mailing list