xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-03-02 17:16:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avcodec/jpeg2000dec: Omit mqc reinit after the last pass

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-06-15 20:29:32 +02:00
parent d107413f1c
commit 2819aeb0f3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/jpeg2000dec.c
View File

@ -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;
}