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/webp.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/webp.c')
| -rw-r--r-- | libavcodec/webp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/webp.c b/libavcodec/webp.c index d35cb66f8d..54b3fde6dc 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -233,7 +233,7 @@ static void image_ctx_free(ImageContext *img) if (img->huffman_groups) { for (i = 0; i < img->nb_huffman_groups; i++) { for (j = 0; j < HUFFMAN_CODES_PER_META_CODE; j++) - ff_free_vlc(&img->huffman_groups[i * HUFFMAN_CODES_PER_META_CODE + j].vlc); + ff_vlc_free(&img->huffman_groups[i * HUFFMAN_CODES_PER_META_CODE + j].vlc); } av_free(img->huffman_groups); } @@ -300,9 +300,9 @@ static int huff_reader_build_canonical(HuffReader *r, const uint8_t *code_length return AVERROR_INVALIDDATA; } - ret = init_vlc(&r->vlc, 8, alphabet_size, + ret = vlc_init(&r->vlc, 8, alphabet_size, code_lengths, sizeof(*code_lengths), sizeof(*code_lengths), - codes, sizeof(*codes), sizeof(*codes), INIT_VLC_OUTPUT_LE); + codes, sizeof(*codes), sizeof(*codes), VLC_INIT_OUTPUT_LE); if (ret < 0) { av_free(codes); return ret; @@ -415,7 +415,7 @@ static int read_huffman_code_normal(WebPContext *s, HuffReader *hc, ret = huff_reader_build_canonical(hc, code_lengths, alphabet_size); finish: - ff_free_vlc(&code_len_hc.vlc); + ff_vlc_free(&code_len_hc.vlc); av_free(code_lengths); return ret; } |