summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/pngdec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 80631f7b51..15b48c372c 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -650,9 +650,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;