From d15ce053b39463fe10d466eac5cb83f9f88b4aa2 Mon Sep 17 00:00:00 2001
From: benoit <benoit@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Date: Fri, 11 Sep 2009 06:25:36 +0000
Subject: [PATCH] =?utf8?q?Make=20get=5Fur=5Fgolomb=20capable=20of=20readin?=
 =?utf8?q?g=2016=20bit=20values.=20Patch=20by=20Lars=20Ta=C3=BCber:=20firs?=
 =?utf8?q?tname=20taeuber=20gmx=20net?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19821 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
---
 libavcodec/golomb.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h
index 7044042c95..c227607f1f 100644
--- 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;
-- 
2.11.4.GIT