diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-09-08 15:18:12 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-09-11 00:27:45 +0200 |
| commit | 9cdf82c2c2f0cec6d3963737bfdf3b3f3112ff20 (patch) | |
| tree | 74f8ed5b6a51ced9f8dd0821da4dd00c8efa5944 /libavcodec/mvha.c | |
| parent | 95e876f069e9c5ed268ddcdeb06cc5e056c5e63c (diff) | |
avcodec/vlc: Use proper namespace
Therefore use a proper prefix for this API, e.g.
ff_init_vlc_sparse -> ff_vlc_init_sparse
ff_free_vlc -> ff_vlc_free
INIT_VLC_LE -> VLC_INIT_LE
INIT_VLC_USE_NEW_STATIC -> VLC_INIT_USE_STATIC
(The ancient INIT_VLC_USE_STATIC has been removed
in 595324e143b57a52e2329eb47b84395c70f93087, so that
the NEW has been dropped.)
Finally, reorder the flags and change their values
accordingly.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/mvha.c')
| -rw-r--r-- | libavcodec/mvha.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mvha.c b/libavcodec/mvha.c index 8fb4a69e9e..356cebc64e 100644 --- a/libavcodec/mvha.c +++ b/libavcodec/mvha.c @@ -83,7 +83,7 @@ static int build_vlc(AVCodecContext *avctx, VLC *vlc) uint8_t xlat[256]; int cur_node, i, j, pos = 0; - ff_free_vlc(vlc); + ff_vlc_free(vlc); for (i = 0; i < s->nb_symbols; i++) { nodes[i].count = s->prob[i]; @@ -140,7 +140,7 @@ static int build_vlc(AVCodecContext *avctx, VLC *vlc) get_tree_codes(bits, lens, xlat, nodes, cur_node - 1, 0, 0, &pos); - return ff_init_vlc_sparse(vlc, 12, pos, lens, 2, 2, bits, 4, 4, xlat, 1, 1, 0); + return ff_vlc_init_sparse(vlc, 12, pos, lens, 2, 2, bits, 4, 4, xlat, 1, 1, 0); } static int decode_frame(AVCodecContext *avctx, AVFrame *frame, @@ -294,7 +294,7 @@ static av_cold int decode_close(AVCodecContext *avctx) MVHAContext *s = avctx->priv_data; ff_inflate_end(&s->zstream); - ff_free_vlc(&s->vlc); + ff_vlc_free(&s->vlc); return 0; } |