aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-09-16 01:24:12 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-09-16 01:24:12 +0000
commit740c14dbd788c1a3c49bea3af0af87b5f8077933 (patch)
tree8efbe1e3ab9a9932b5d8288909b59415ab96feb2
parent0bc4c436aad4dd76fec58a6ce801a27b6039c481 (diff)
downloadffmpeg-740c14dbd788c1a3c49bea3af0af87b5f8077933.tar.gz
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
-rw-r--r--libavcodec/golomb.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h
index f2fb8928a2..627fcdc40f 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 - k >= 32-MIN_CACHE_BITS){
+ if(log - k >= 32-MIN_CACHE_BITS && 32-log < limit){
buf >>= log - k;
buf += (30-log)<<k;
LAST_SKIP_BITS(re, gb, 32 + k - log);