From 387783749faca39c98571d139c32866923ab5653 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 13 Feb 2012 23:51:37 +0100 Subject: [PATCH] jpeglsdec: fix bpp & limit. Fixes: Tikcet969 Thanks-to: ITU for the freely available spec. Signed-off-by: Michael Niedermayer --- libavcodec/jpegls.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/jpegls.c b/libavcodec/jpegls.c index c40b929e95..f1ce16e0d8 100644 --- a/libavcodec/jpegls.c +++ b/libavcodec/jpegls.c @@ -36,10 +36,8 @@ void ff_jpegls_init_state(JLSState *state){ // QBPP = ceil(log2(RANGE)) for(state->qbpp = 0; (1 << state->qbpp) < state->range; state->qbpp++); - if(state->bpp < 8) - state->limit = 16 + 2 * state->bpp - state->qbpp; - else - state->limit = (4 * state->bpp) - state->qbpp; + state->bpp = FFMAX(av_log2(state->maxval)+1, 2); + state->limit = 2*(state->bpp + FFMAX(state->bpp, 8)) - state->qbpp; for(i = 0; i < 367; i++) { state->A[i] = FFMAX((state->range + 32) >> 6, 2);