[FFmpeg-cvslog] jpeglsdec: fix bpp & limit.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 13 23:51:37 2012 +0100| [387783749faca39c98571d139c32866923ab5653] | committer: Michael Niedermayer

jpeglsdec: fix bpp & limit.

Fixes: Tikcet969

Thanks-to: ITU for the freely available spec.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=387783749faca39c98571d139c32866923ab5653
---

 libavcodec/jpegls.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavcodec/jpegls.c b/libavcodec/jpegls.c
index c40b929..f1ce16e 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);