summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-10-31 18:23:47 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-12-08 17:51:46 +0100
commit760217f469df4bb9f73535abb39c4282cc8b4e02 (patch)
tree07b3f61671fcbc72f806dcde9d8cc919f6f5741c
parent682b0e42e4a09d2d745293385a557fb5f316cb95 (diff)
avcodec/qdm2: Apply offsets when initializing VLCs
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
-rw-r--r--libavcodec/qdm2.c2
-rw-r--r--libavcodec/qdm2_tablegen.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index c3e1315ef0..118e2eac1f 100644
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -205,7 +205,7 @@ static int qdm2_get_vlc(GetBitContext *gb, const VLC *vlc, int flag, int depth)
value = get_vlc2(gb, vlc->table, vlc->bits, depth);
/* stage-2, 3 bits exponent escape sequence */
- if (value-- == 0)
+ if (value < 0)
value = get_bits(gb, get_bits(gb, 3) + 1);
/* stage-3, optional */
diff --git a/libavcodec/qdm2_tablegen.h b/libavcodec/qdm2_tablegen.h
index d91bd04dc8..e948e92295 100644
--- a/libavcodec/qdm2_tablegen.h
+++ b/libavcodec/qdm2_tablegen.h
@@ -122,7 +122,7 @@ static av_cold void build_vlc(VLC *vlc, int nb_bits, int nb_codes, int idx,
vlc->table_allocated = qdm2_vlc_offs[idx + 1] - qdm2_vlc_offs[idx];
ff_init_vlc_from_lengths(vlc, nb_bits, nb_codes,
&tab[0][1], 2, &tab[0][0], 2, 1,
- 0, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE, NULL);
+ -1, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE, NULL);
}
static av_cold void qdm2_init_vlc(void)