Make get_ur_golomb capable of reading 16 bit values.

Patch by Lars Taüber: firstname taeuber gmx net


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

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;