From f67f2681da5fe6a1a97674c6855e670fd089c34d Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 30 May 2013 20:54:52 +0200 Subject: [PATCH] jpeg2000deci/j2kdec: fix sizeof types Signed-off-by: Michael Niedermayer --- libavcodec/j2kdec.c | 8 ++++---- libavcodec/jpeg2000dec.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c index 66b427883c0..94341e19bcb 100644 --- a/libavcodec/j2kdec.c +++ b/libavcodec/j2kdec.c @@ -792,11 +792,11 @@ static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty, int bpass_csty_symbol = JPEG2000_CBLK_BYPASS & codsty->cblk_style; int vert_causal_ctx_csty_symbol = JPEG2000_CBLK_VSC & codsty->cblk_style; - for (y = 0; y < height+2; y++) - memset(t1->flags[y], 0, (width + 2)*sizeof(int)); - for (y = 0; y < height; y++) - memset(t1->data[y], 0, width*sizeof(int)); + memset(t1->data[y], 0, width * sizeof(**t1->data)); + + for (y = 0; y < height+2; y++) + memset(t1->flags[y], 0, (width + 2)*sizeof(**t1->flags)); cblk->data[cblk->length] = 0xff; cblk->data[cblk->length+1] = 0xff; diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index a276a0922f8..bb8b0cc8034 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -876,13 +876,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)); cblk->data[cblk->length] = 0xff; cblk->data[cblk->length + 1] = 0xff; -- 2.39.2