OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b55aa7d
)
cinepak: simplify, use FFMIN()
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 16 Nov 2011 16:15:15 +0000
(17:15 +0100)
committer
Martin Storsjö
<martin@martin.st>
Fri, 18 Nov 2011 09:36:05 +0000
(11:36 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Martin Storsjö <martin@martin.st>
libavcodec/cinepak.c
patch
|
blob
|
history
diff --git
a/libavcodec/cinepak.c
b/libavcodec/cinepak.c
index
0dbdeab
..
c6edfe6
100644
(file)
--- 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)