diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-31 02:12:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-31 03:10:08 +0200 |
| commit | 9d56ccf5af52cb6d937c85c6c205cd38fa9d54ba (patch) | |
| tree | 90555a38c78062885be162271998559c64fe80ff /libavcodec/jpeg2000.c | |
| parent | fd7e1190379db1b2b3eaa31c00dc9c92803faef3 (diff) | |
| download | ffmpeg-9d56ccf5af52cb6d937c85c6c205cd38fa9d54ba.tar.gz | |
j2k/jpeg2000dec: merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000.c')
| -rw-r--r-- | libavcodec/jpeg2000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index d41ec74dac..26446cf308 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -492,7 +492,7 @@ void ff_jpeg2000_reinit(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty) void ff_jpeg2000_cleanup(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty) { int reslevelno, bandno, precno; - for (reslevelno = 0; reslevelno < codsty->nreslevels; reslevelno++) { + for (reslevelno = 0; comp->reslevel && reslevelno < codsty->nreslevels; reslevelno++) { Jpeg2000ResLevel *reslevel = comp->reslevel + reslevelno; for (bandno = 0; bandno < reslevel->nbands; bandno++) { |