summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-02-13 22:04:22 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-02-14 01:22:38 +0100
commitdda713f8707ee291670092fe808552246bade728 (patch)
tree99fca2a51c29780429c7641c79dc7c841f7c54a0
parentb986590810fb5f90bc253882fa698bf3b9cf5efa (diff)
iff: Fix decode_ham_plane32() buf_size.
The wrong variable was passed into decode_ham_plane32() Fixes: Ticket922 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/iff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index 24167c722c..2185946649 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -544,7 +544,7 @@ static int decode_frame_ilbm(AVCodecContext *avctx,
uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ];
memcpy(s->ham_buf, buf, FFMIN(avctx->width, buf_end - buf));
buf += avctx->width + (avctx->width & 1); // padding if odd
- decode_ham_plane32((uint32_t *) row, s->ham_buf, s->ham_palbuf, avctx->width);
+ decode_ham_plane32((uint32_t *) row, s->ham_buf, s->ham_palbuf, s->planesize);
}
}
@@ -631,7 +631,7 @@ static int decode_frame_byterun1(AVCodecContext *avctx,
for (y = 0; y < avctx->height ; y++) {
uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]];
buf += decode_byterun(s->ham_buf, avctx->width, buf, buf_end);
- decode_ham_plane32((uint32_t *) row, s->ham_buf, s->ham_palbuf, avctx->width);
+ decode_ham_plane32((uint32_t *) row, s->ham_buf, s->ham_palbuf, s->planesize);
}
}