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/jpegxl_parser.c | |
parent | 95e876f069e9c5ed268ddcdeb06cc5e056c5e63c (diff) | |
download | ffmpeg-9cdf82c2c2f0cec6d3963737bfdf3b3f3112ff20.tar.gz |
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/jpegxl_parser.c')
-rw-r--r-- | libavcodec/jpegxl_parser.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/jpegxl_parser.c b/libavcodec/jpegxl_parser.c index 20c8a41a89..4010bc713a 100644 --- a/libavcodec/jpegxl_parser.c +++ b/libavcodec/jpegxl_parser.c @@ -474,7 +474,7 @@ static void dist_bundle_close(JXLDistributionBundle *bundle) { if (bundle->use_prefix_code && bundle->dists) for (int i = 0; i < bundle->num_clusters; i++) - ff_free_vlc(&bundle->dists[i].vlc); + ff_vlc_free(&bundle->dists[i].vlc); av_freep(&bundle->dists); av_freep(&bundle->cluster_map); } @@ -668,8 +668,8 @@ static int read_simple_vlc_prefix(GetBitContext *gb, JXLEntropyDecoder *dec, JXL return AVERROR_BUG; } - return ff_init_vlc_from_lengths(&dist->vlc, bits, nsym, lens, 1, symbols, - 2, 2, 0, INIT_VLC_LE, dec->logctx); + return ff_vlc_init_from_lengths(&dist->vlc, bits, nsym, lens, 1, symbols, + 2, 2, 0, VLC_INIT_LE, dec->logctx); } static int read_vlc_prefix(GetBitContext *gb, JXLEntropyDecoder *dec, JXLSymbolDistribution *dist) @@ -724,8 +724,8 @@ static int read_vlc_prefix(GetBitContext *gb, JXLEntropyDecoder *dec, JXLSymbolD level1_syms[idx] = i; } - ret = ff_init_vlc_from_lengths(&level1_vlc, 5, 18, level1_lens_s, 1, level1_syms, 2, 2, - 0, INIT_VLC_LE, dec->logctx); + ret = ff_vlc_init_from_lengths(&level1_vlc, 5, 18, level1_lens_s, 1, level1_syms, 2, 2, + 0, VLC_INIT_LE, dec->logctx); if (ret < 0) goto end; @@ -789,12 +789,12 @@ static int read_vlc_prefix(GetBitContext *gb, JXLEntropyDecoder *dec, JXLSymbolD level2_syms[idx] = i; } - ret = ff_init_vlc_from_lengths(&dist->vlc, 15, dist->alphabet_size, level2_lens_s, - 1, level2_syms, 2, 2, 0, INIT_VLC_LE, dec->logctx); + ret = ff_vlc_init_from_lengths(&dist->vlc, 15, dist->alphabet_size, level2_lens_s, + 1, level2_syms, 2, 2, 0, VLC_INIT_LE, dec->logctx); end: av_freep(&buf); - ff_free_vlc(&level1_vlc); + ff_vlc_free(&level1_vlc); return ret; } |