diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-12-17 23:35:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-12-21 19:48:41 +0100 |
| commit | 80344959f064c7ea10d023862e0f6b79835de9de (patch) | |
| tree | 1850e87ad5589296d5a2b530fa40e96c88b4f571 /libavcodec/jpeg2000dec.c | |
| parent | 4b2a186ef02c1fbe7f7cae30a2bdfff72bcc75f7 (diff) | |
| download | ffmpeg-80344959f064c7ea10d023862e0f6b79835de9de.tar.gz | |
avcodec/jpeg2000dec: Free lengthinc earlier
Reduces memory needed
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/jpeg2000dec.c')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 617273b36b..8071dc3c84 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1046,6 +1046,8 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, nb_code_blocks = prec->nb_codeblocks_height * prec->nb_codeblocks_width; for (cblkno = 0; cblkno < nb_code_blocks; cblkno++) { Jpeg2000Cblk *cblk = prec->cblk + cblkno; + if (!cblk->nb_terminationsinc && !cblk->lengthinc) + continue; for (cwsno = 0; cwsno < cblk->nb_lengthinc; cwsno ++) { if (cblk->data_allocated < cblk->length + cblk->lengthinc[cwsno] + 4) { size_t new_size = FFMAX(2*cblk->data_allocated, cblk->length + cblk->lengthinc[cwsno] + 4); @@ -1075,6 +1077,7 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, cblk->data_start[cblk->nb_terminations] = cblk->length; } } + av_freep(&cblk->lengthinc); } } return 0; |