[FFmpeg-cvslog] iff: Fix decode_ham_plane32() buf_size.
Michael Niedermayer
git at videolan.org
Tue Feb 14 01:46:20 CET 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 13 22:04:22 2012 +0100| [dda713f8707ee291670092fe808552246bade728] | committer: Michael Niedermayer
iff: Fix decode_ham_plane32() buf_size.
The wrong variable was passed into decode_ham_plane32()
Fixes: Ticket922
Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dda713f8707ee291670092fe808552246bade728
---
libavcodec/iff.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index 24167c7..2185946 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);
}
}
More information about the ffmpeg-cvslog
mailing list