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/mpegaudiodec_common.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/mpegaudiodec_common.c')
| -rw-r--r-- | libavcodec/mpegaudiodec_common.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpegaudiodec_common.c b/libavcodec/mpegaudiodec_common.c index 5fcb39b325..3a60b03e9e 100644 --- a/libavcodec/mpegaudiodec_common.c +++ b/libavcodec/mpegaudiodec_common.c @@ -428,9 +428,9 @@ static av_cold void mpegaudiodec_common_init_static(void) ff_huff_vlc[++i].table = huff_vlc_tables + offset; ff_huff_vlc[i].table_allocated = FF_ARRAY_ELEMS(huff_vlc_tables) - offset; - ff_init_vlc_from_lengths(&ff_huff_vlc[i], 7, j, + ff_vlc_init_from_lengths(&ff_huff_vlc[i], 7, j, huff_lens, 1, tmp_symbols, 2, 2, - 0, INIT_VLC_STATIC_OVERLONG, NULL); + 0, VLC_INIT_STATIC_OVERLONG, NULL); offset += ff_huff_vlc[i].table_size; huff_lens += j; huff_sym += j; @@ -443,9 +443,9 @@ static av_cold void mpegaudiodec_common_init_static(void) ff_huff_quad_vlc[i].table = huff_quad_vlc_tables + offset; ff_huff_quad_vlc[i].table_allocated = 1 << bits; offset += 1 << bits; - init_vlc(&ff_huff_quad_vlc[i], bits, 16, + vlc_init(&ff_huff_quad_vlc[i], bits, 16, mpa_quad_bits[i], 1, 1, mpa_quad_codes[i], 1, 1, - INIT_VLC_USE_NEW_STATIC); + VLC_INIT_USE_STATIC); } av_assert0(offset == FF_ARRAY_ELEMS(huff_quad_vlc_tables)); |