RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

jpeg2000: Use the correct sizeof in memset for T1 data 

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Michael Niedermayer 2013-07-01 10:01:27 +02:00 committed by Luca Barbato
parent 5b73916d34
commit 589e5b52f6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/jpeg2000dec.c
View File

@ -940,12 +940,13 @@ static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty,
int passno = cblk->npasses, pass_t = 2, bpno = cblk->nonzerobits - 1, y; int passno = cblk->npasses, pass_t = 2, bpno = cblk->nonzerobits - 1, y;
for (y = 0; y < height; 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 code-block contains no compressed data: nothing to do. */
if (!cblk->length) if (!cblk->length)
return 0; return 0;
for (y = 0; y < height + 2; y++) 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); ff_mqc_initdec(&t1->mqc, cblk->data);
cblk->data[cblk->length] = 0xff; cblk->data[cblk->length] = 0xff;