[FFmpeg-devel] [PATCH v2 145/162] avcodec/imm4: Make better use of symbols table

[Andreas Rheinhardt]

Also inline the VLC's number of bits while at it.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
---
 libavcodec/imm4.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/imm4.c b/libavcodec/imm4.c
index 85d8526bc8..85046f7d06 100644
--- a/libavcodec/imm4.c
+++ b/libavcodec/imm4.c
@@ -61,7 +61,7 @@ static const uint8_t inter_cb[] = {
 };
 
 static const uint8_t cbplo_symbols[] = {
-    3, 4, 19, 20, 35, 36, 51, 52
+    0, 0, 1, 1, 2, 2, 3, 3
 };
 
 static const uint8_t cbplo_bits[] = {
@@ -236,7 +236,7 @@ static int decode_intra(AVCodecContext *avctx, GetBitContext *gb, AVFrame *frame
         for (x = 0; x < avctx->width; x += 16) {
             unsigned flag, cbphi, cbplo;
 
-            cbplo = get_vlc2(gb, cbplo_tab.table, cbplo_tab.bits, 1) >> 4;
+            cbplo = get_vlc2(gb, cbplo_tab.table, CBPLO_VLC_BITS, 1);
             flag = get_bits1(gb);
 
             cbphi = get_cbphi(gb, 1);
-- 
2.25.1