diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-01 10:01:27 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-07-02 20:05:46 +0200 |
| commit | 589e5b52f634f6b2d307a167a19eef7e7328cb08 (patch) | |
| tree | fc50a5f038fe3156da63aec79906a3099bd6fa97 | |
| parent | 5b73916d34527ce9a615f7934e02558ad1d77713 (diff) | |
| download | ffmpeg-589e5b52f634f6b2d307a167a19eef7e7328cb08.tar.gz | |
jpeg2000: Use the correct sizeof in memset for T1 data
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 0fa8ccaa16..346a5c6867 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; |