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/wma.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/wma.c')
| -rw-r--r-- | libavcodec/wma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/wma.c b/libavcodec/wma.c index 41d16e52f8..3b4d049a83 100644 --- a/libavcodec/wma.c +++ b/libavcodec/wma.c @@ -42,7 +42,7 @@ static av_cold int init_coef_vlc(VLC *vlc, uint16_t **prun_table, float *flevel_table; int i, l, j, k, level, ret; - ret = init_vlc(vlc, VLCBITS, n, table_bits, 1, 1, table_codes, 4, 4, 0); + ret = vlc_init(vlc, VLCBITS, n, table_bits, 1, 1, table_codes, 4, 4, 0); if (ret < 0) return ret; @@ -372,11 +372,11 @@ int ff_wma_end(AVCodecContext *avctx) av_tx_uninit(&s->mdct_ctx[i]); if (s->use_exp_vlc) - ff_free_vlc(&s->exp_vlc); + ff_vlc_free(&s->exp_vlc); if (s->use_noise_coding) - ff_free_vlc(&s->hgain_vlc); + ff_vlc_free(&s->hgain_vlc); for (i = 0; i < 2; i++) { - ff_free_vlc(&s->coef_vlc[i]); + ff_vlc_free(&s->coef_vlc[i]); av_freep(&s->run_table[i]); av_freep(&s->level_table[i]); av_freep(&s->int_table[i]); |