From d4f2a6250aa0598a4a6414a3eb34e4f462b290b0 Mon Sep 17 00:00:00 2001 From: Måns Rullgård Date: Tue, 24 Feb 2009 01:41:44 +0000 Subject: Fix get_ur_golomb_jpegls() with A32_BITSTREAM_READER If k==0, log==0 can indicate that the coded value uses more than MIN_CACHE_BITS bits. With MIN_CACHE_BITS==32, the fast branch is incorrectly taken in this case unless explicitly forbidden. Originally committed as revision 17550 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/golomb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/golomb.h') diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h index 989a87a88e..59b4f9eca0 100644 --- a/libavcodec/golomb.h +++ b/libavcodec/golomb.h @@ -273,7 +273,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 && 32-log < limit){ + if(log - k >= 32-MIN_CACHE_BITS+(MIN_CACHE_BITS==32) && 32-log < limit){ buf >>= log - k; buf += (30-log)<