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:
5d852f3
)
avcodec/pngdec: Calculate MPNG bytewidth more defensively
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 3 Oct 2014 15:54:21 +0000
(17:54 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 28 Nov 2014 17:44:38 +0000
(18:44 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
e830902934a29df05c7af65aef2a480b15f572c4
)
Conflicts:
libavcodec/pngdec.c
libavcodec/pngdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/pngdec.c
b/libavcodec/pngdec.c
index
5766793
..
f01df75
100644
(file)
--- a/
libavcodec/pngdec.c
+++ b/
libavcodec/pngdec.c
@@
-841,10
+841,11
@@
static int decode_frame(AVCodecContext *avctx,
int i, j;
uint8_t *pd = p->data[0];
uint8_t *pd_last = s->last_picture.f->data[0];
+ int ls = FFMIN(av_image_get_linesize(p->format, s->width, 0), s->width * s->bpp);
ff_thread_await_progress(&s->last_picture, INT_MAX, 0);
for (j = 0; j < s->height; j++) {
- for (i = 0; i <
s->width * s->bpp
; i++) {
+ for (i = 0; i <
ls
; i++) {
pd[i] += pd_last[i];
}
pd += s->image_linesize;