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

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
6fa6c481 · Lars Täuber · Benoit Fouet · 6249c33e · 6fa6c481
Commit 6fa6c481 authored Sep 11, 2009 by Lars Täuber Committed by Benoit Fouet Sep 11, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

golomb.h libavcodec/golomb.h +6 -2

No files found.
--- 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;