virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-19 09:02:26 +02:00
Code Issues Releases Activity

cinepak: simplify, use FFMIN()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Michael Niedermayer 2011-11-16 17:15:15 +01:00 committed by Martin Storsjö
parent b55aa7df6b
commit a2b51fe87c
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/cinepak.c
View File

@ -357,8 +357,7 @@ static int cinepak_decode (CinepakContext *s)
s->data += 10 + s->sega_film_skip_bytes; s->data += 10 + s->sega_film_skip_bytes;
if (num_strips > MAX_STRIPS) num_strips = FFMIN(num_strips, MAX_STRIPS);
num_strips = MAX_STRIPS;
for (i=0; i < num_strips; i++) { for (i=0; i < num_strips; i++) {
if ((s->data + 12) > eod) if ((s->data + 12) > eod)