Commit 740c14db authored by Michael Niedermayer's avatar Michael Niedermayer

Fix regression test failure caused by golomb limit not being considered

in r15334.

Originally committed as revision 15338 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 0bc4c436
...@@ -255,7 +255,7 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit, int ...@@ -255,7 +255,7 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit, int
log= av_log2(buf); log= av_log2(buf);
if(log - k >= 32-MIN_CACHE_BITS){ if(log - k >= 32-MIN_CACHE_BITS && 32-log < limit){
buf >>= log - k; buf >>= log - k;
buf += (30-log)<<k; buf += (30-log)<<k;
LAST_SKIP_BITS(re, gb, 32 + k - log); LAST_SKIP_BITS(re, gb, 32 + k - log);
......
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