Make get_ur_golomb capable of reading 16 bit values.

Patch by Lars Täuber: firstname taeuber gmx net Originally committed as revision 19821 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago · 6fa6c481b9
parent 6249c33e5a
commit 6fa6c481b9
1 changed files with 6 additions and 2 deletions
--- a/libavcodec/golomb.h
+++ b/libavcodec/golomb.h
@ -253,8 +253,12 @@ static inline int get_ur_golomb(GetBitContext *gb, int k, int limit, int esc_len

        return buf;
    }else{
-        buf >>= 32 - limit - esc_len;
-        LAST_SKIP_BITS(re, gb, esc_len + limit);
+        LAST_SKIP_BITS(re, gb, limit);
+        UPDATE_CACHE(re, gb);
+
+        buf = SHOW_UBITS(re, gb, esc_len);
+
+        LAST_SKIP_BITS(re, gb, esc_len);
        CLOSE_READER(re, gb);

        return buf + limit - 1;