Module: libav Branch: master Commit: 589e5b52f634f6b2d307a167a19eef7e7328cb08
Author: Michael Niedermayer <[email protected]> Committer: Luca Barbato <[email protected]> Date: Mon Jul 1 10:01:27 2013 +0200 jpeg2000: Use the correct sizeof in memset for T1 data Signed-off-by: Luca Barbato <[email protected]> --- libavcodec/jpeg2000dec.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 0fa8cca..346a5c6 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -940,12 +940,13 @@ static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty, int passno = cblk->npasses, pass_t = 2, bpno = cblk->nonzerobits - 1, y; for (y = 0; y < height; y++) - memset(t1->data[y], 0, width * sizeof(width)); + memset(t1->data[y], 0, width * sizeof(**t1->data)); + /* If code-block contains no compressed data: nothing to do. */ if (!cblk->length) return 0; for (y = 0; y < height + 2; y++) - memset(t1->flags[y], 0, (width + 2) * sizeof(width)); + memset(t1->flags[y], 0, (width + 2) * sizeof(**t1->flags)); ff_mqc_initdec(&t1->mqc, cblk->data); cblk->data[cblk->length] = 0xff; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
