Index: apps/codecs/libffmpegFLAC/golomb.h
===================================================================
--- apps/codecs/libffmpegFLAC/golomb.h	(revision 20646)
+++ apps/codecs/libffmpegFLAC/golomb.h	(working copy)
@@ -63,7 +63,7 @@
 
     log= av_log2(buf);
     
-    if(log > 31-11){
+    if(log - k >= 32-MIN_CACHE_BITS+(MIN_CACHE_BITS==32) && 32-log < limit){
         buf >>= log - k;
         buf += (30-log)<<k;
         LAST_SKIP_BITS(re, gb, 32 + k - log);