ffmpeg | branch: release/1.1 | Michael Niedermayer <michae...@gmx.at> | Fri Oct
3 17:54:21 2014 +0200| [d37e539d5ef08932c316cf50c00d52cc15e6b413] | committer:
Michael Niedermayer
avcodec/pngdec: Calculate MPNG bytewidth more defensively
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
(cherry picked from commit e830902934a29df05c7af65aef2a480b15f572c4)
Conflicts:
libavcodec/pngdec.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d37e539d5ef08932c316cf50c00d52cc15e6b413
---
libavcodec/pngdec.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 2180f66..b911c32 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -841,9 +841,10 @@ static int decode_frame(AVCodecContext *avctx,
int i, j;
uint8_t *pd = s->current_picture->data[0];
uint8_t *pd_last = s->last_picture->data[0];
+ int ls = FFMIN(av_image_get_linesize(s->current_picture->format,
s->width, 0), s->width * s->bpp);
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;
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
