Commit 2819aeb0 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/jpeg2000dec: Omit mqc reinit after the last pass

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent d107413f
......@@ -1388,8 +1388,8 @@ static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty,
if (codsty->cblk_style & JPEG2000_CBLK_RESET) // XXX no testcase for just this
ff_mqc_init_contexts(&t1->mqc);
if ((coder_type = needs_termination(codsty->cblk_style, pass_cnt))) {
if (term_cnt >= cblk->nb_terminations) {
if (passno && (coder_type = needs_termination(codsty->cblk_style, pass_cnt))) {
if (term_cnt > cblk->nb_terminations) {
av_log(s->avctx, AV_LOG_ERROR, "Missing needed termination \n");
return AVERROR_INVALIDDATA;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment