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/smacker.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/smacker.c')
| -rw-r--r-- | libavcodec/smacker.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index b98e7275f6..ffa0820f52 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -220,10 +220,10 @@ static int smacker_decode_header_tree(SmackVContext *smk, GetBitContext *gb, int goto error; skip_bits1(gb); if (h.current > 1) { - err = ff_init_vlc_from_lengths(&vlc[i], SMKTREE_BITS, h.current, + err = ff_vlc_init_from_lengths(&vlc[i], SMKTREE_BITS, h.current, &h.entries[0].length, sizeof(*h.entries), &h.entries[0].value, sizeof(*h.entries), 1, - 0, INIT_VLC_OUTPUT_LE, smk->avctx); + 0, VLC_INIT_OUTPUT_LE, smk->avctx); if (err < 0) { av_log(smk->avctx, AV_LOG_ERROR, "Cannot build VLC table\n"); goto error; @@ -264,7 +264,7 @@ static int smacker_decode_header_tree(SmackVContext *smk, GetBitContext *gb, int err = 0; error: for (int i = 0; i < 2; i++) { - ff_free_vlc(&vlc[i]); + ff_vlc_free(&vlc[i]); } return err; @@ -659,10 +659,10 @@ static int smka_decode_frame(AVCodecContext *avctx, AVFrame *frame, goto error; skip_bits1(&gb); if (h.current > 1) { - ret = ff_init_vlc_from_lengths(&vlc[i], SMKTREE_BITS, h.current, + ret = ff_vlc_init_from_lengths(&vlc[i], SMKTREE_BITS, h.current, &h.entries[0].length, sizeof(*h.entries), &h.entries[0].value, sizeof(*h.entries), 1, - 0, INIT_VLC_OUTPUT_LE, avctx); + 0, VLC_INIT_OUTPUT_LE, avctx); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Cannot build VLC table\n"); goto error; @@ -740,7 +740,7 @@ static int smka_decode_frame(AVCodecContext *avctx, AVFrame *frame, error: for(i = 0; i < 4; i++) { - ff_free_vlc(&vlc[i]); + ff_vlc_free(&vlc[i]); } return ret; |