From 2819aeb0f3c2ecd6c397534655defe551874f3be Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 15 Jun 2015 20:29:32 +0200 Subject: [PATCH] avcodec/jpeg2000dec: Omit mqc reinit after the last pass Signed-off-by: Michael Niedermayer --- libavcodec/jpeg2000dec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 61e4dfdd0d..a2862bd6dc 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -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; }