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/4xm.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/4xm.c')
| -rw-r--r-- | libavcodec/4xm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 411e50da7c..c3e3a45df5 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -257,10 +257,10 @@ static av_cold void init_vlcs(void) for (j = 0; j < 4; j++) { block_type_vlc[i][j].table = table[i][j]; block_type_vlc[i][j].table_allocated = 32; - init_vlc(&block_type_vlc[i][j], BLOCK_TYPE_VLC_BITS, 7, + vlc_init(&block_type_vlc[i][j], BLOCK_TYPE_VLC_BITS, 7, &block_type_tab[i][j][0][1], 2, 1, &block_type_tab[i][j][0][0], 2, 1, - INIT_VLC_USE_NEW_STATIC); + VLC_INIT_USE_STATIC); } } } @@ -706,8 +706,8 @@ static const uint8_t *read_huffman_tables(FourXContext *f, len_tab[j] = len; } - ff_free_vlc(&f->pre_vlc); - if (init_vlc(&f->pre_vlc, ACDC_VLC_BITS, 257, len_tab, 1, 1, + ff_vlc_free(&f->pre_vlc); + if (vlc_init(&f->pre_vlc, ACDC_VLC_BITS, 257, len_tab, 1, 1, bits_tab, 4, 4, 0)) return NULL; @@ -985,7 +985,7 @@ static av_cold int decode_end(AVCodecContext *avctx) av_freep(&f->cfrm[i].data); f->cfrm[i].allocated_size = 0; } - ff_free_vlc(&f->pre_vlc); + ff_vlc_free(&f->pre_vlc); return 0; } |