From: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Date: Tue, 13 Oct 2020 08:50:42 +0000 (+0200)
Subject: avcodec/ylc: Inline constants
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6608ecb1b5535fc03fef051253de5fb18d8dd15f;p=ffmpeg

avcodec/ylc: Inline constants

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---

diff --git a/libavcodec/ylc.c b/libavcodec/ylc.c
index 2afe3fc9d5c..f68fcf0bba8 100644
--- a/libavcodec/ylc.c
+++ b/libavcodec/ylc.c
@@ -22,6 +22,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define YLC_VLC_BITS 10
+
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
@@ -149,7 +151,8 @@ static int build_vlc(AVCodecContext *avctx, VLC *vlc, const uint32_t *table)
 
     get_tree_codes(bits, lens, xlat, nodes, cur_node - 1, 0, 0, &pos);
 
-    return ff_init_vlc_sparse(vlc, 10, pos, lens, 2, 2, bits, 4, 4, xlat, 1, 1, 0);
+    return ff_init_vlc_sparse(vlc, YLC_VLC_BITS, pos, lens, 2, 2,
+                              bits, 4, 4, xlat, 1, 1, 0);
 }
 
 static const uint8_t table_y1[] = {
@@ -371,7 +374,7 @@ static int decode_frame(AVCodecContext *avctx,
                 return AVERROR_INVALIDDATA;
 
             if (get_bits1(&gb)) {
-                int val = get_vlc2(&gb, s->vlc[0].table, s->vlc[0].bits, 3);
+                int val = get_vlc2(&gb, s->vlc[0].table, YLC_VLC_BITS, 3);
                 if (val < 0) {
                     return AVERROR_INVALIDDATA;
                 } else if (val < 0xE1) {
@@ -394,10 +397,10 @@ static int decode_frame(AVCodecContext *avctx,
             } else {
                 int y1, y2, u, v;
 
-                y1 = get_vlc2(&gb, s->vlc[1].table, s->vlc[1].bits, 3);
-                u  = get_vlc2(&gb, s->vlc[2].table, s->vlc[2].bits, 3);
-                y2 = get_vlc2(&gb, s->vlc[1].table, s->vlc[1].bits, 3);
-                v  = get_vlc2(&gb, s->vlc[3].table, s->vlc[3].bits, 3);
+                y1 = get_vlc2(&gb, s->vlc[1].table, YLC_VLC_BITS, 3);
+                u  = get_vlc2(&gb, s->vlc[2].table, YLC_VLC_BITS, 3);
+                y2 = get_vlc2(&gb, s->vlc[1].table, YLC_VLC_BITS, 3);
+                v  = get_vlc2(&gb, s->vlc[3].table, YLC_VLC_BITS, 3);
                 if (y1 < 0 || y2 < 0 || u < 0 || v < 0)
                     return AVERROR_INVALIDDATA;
                 dst[x    ] = y1;