1000l to the ffsvq3 author, our default bitstream reader is only guranteed to...

1000l to the ffsvq3 author, our default bitstream reader is only guranteed to be able to read 25bit at a time


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@3237 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavcodec/golomb.h

@@ -80,7 +80,10 @@ static inline int svq3_get_ue_golomb(GetBitContext *gb){
         
         return ff_interleaved_ue_golomb_vlc_code[buf];
     }else{
-        buf|=1;
+        LAST_SKIP_BITS(re, gb, 8);
+        UPDATE_CACHE(re, gb);
+        buf |= 1 | (GET_CACHE(re, gb) >> 8);
+
         if((buf & 0xAAAAAAAA) == 0)
             return INVALID_VLC;
 
@@ -88,7 +91,7 @@ static inline int svq3_get_ue_golomb(GetBitContext *gb){
             buf = (buf << 2) - ((buf << log) >> (log - 1)) + (buf >> 30);
         }
 
-        LAST_SKIP_BITS(re, gb, 63 - 2*log);
+        LAST_SKIP_BITS(re, gb, 63 - 2*log - 8);
         CLOSE_READER(re, gb);
 
         return ((buf << log) >> log) - 1;