[FFmpeg-cvslog] r15338 - trunk/libavcodec/golomb.h

michael subversion
Tue Sep 16 03:24:13 CEST 2008


Author: michael
Date: Tue Sep 16 03:24:12 2008
New Revision: 15338

Log:
Fix regression test failure caused by golomb limit not being considered
in r15334.


Modified:
   trunk/libavcodec/golomb.h

Modified: trunk/libavcodec/golomb.h
==============================================================================
--- trunk/libavcodec/golomb.h	(original)
+++ trunk/libavcodec/golomb.h	Tue Sep 16 03:24:12 2008
@@ -255,7 +255,7 @@ static inline int get_ur_golomb_jpegls(G
 
     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);




More information about the ffmpeg-cvslog mailing list