aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-09-15 20:30:22 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-09-15 20:30:22 +0000
commit631e8afb8c59a0759e57ade1c8a910bb46e0fd6d (patch)
tree0742f5b544df5b4906c0ab64e538fda1e7030fd5
parenta64a062fb9a80ca2001a053d0acb8388ba579fd8 (diff)
downloadffmpeg-631e8afb8c59a0759e57ade1c8a910bb46e0fd6d.tar.gz
Correct the threshold of get_ur_golomb_jpegls() at which the optimized
case is used. Fix issue245. Originally committed as revision 15334 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/golomb.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h
index a1d904cced..f2fb8928a2 100644
--- a/libavcodec/golomb.h
+++ b/libavcodec/golomb.h
@@ -255,7 +255,7 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit, int
log= av_log2(buf);
- if(log > 31-11){
+ if(log - k >= 32-MIN_CACHE_BITS){
buf >>= log - k;
buf += (30-log)<<k;
LAST_SKIP_BITS(re, gb, 32 + k - log);