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/svq1dec.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/svq1dec.c')
| -rw-r--r-- | libavcodec/svq1dec.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index e3f22f108c..33217739b2 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -777,11 +777,11 @@ static int svq1_decode_frame(AVCodecContext *avctx, AVFrame *cur, static av_cold void svq1_static_init(void) { - INIT_VLC_STATIC(&svq1_block_type, SVQ1_BLOCK_TYPE_VLC_BITS, 4, + VLC_INIT_STATIC(&svq1_block_type, SVQ1_BLOCK_TYPE_VLC_BITS, 4, &ff_svq1_block_type_vlc[0][1], 2, 1, &ff_svq1_block_type_vlc[0][0], 2, 1, 8); - INIT_VLC_STATIC(&svq1_motion_component, 7, 33, + VLC_INIT_STATIC(&svq1_motion_component, 7, 33, &ff_mvtab[0][1], 2, 1, &ff_mvtab[0][0], 2, 1, 176); @@ -792,24 +792,24 @@ static av_cold void svq1_static_init(void) svq1_intra_multistage[i].table = &table[offset]; svq1_intra_multistage[i].table_allocated = sizes[0][i]; offset += sizes[0][i]; - init_vlc(&svq1_intra_multistage[i], 3, 8, + vlc_init(&svq1_intra_multistage[i], 3, 8, &ff_svq1_intra_multistage_vlc[i][0][1], 2, 1, &ff_svq1_intra_multistage_vlc[i][0][0], 2, 1, - INIT_VLC_USE_NEW_STATIC); + VLC_INIT_USE_STATIC); svq1_inter_multistage[i].table = &table[offset]; svq1_inter_multistage[i].table_allocated = sizes[1][i]; offset += sizes[1][i]; - init_vlc(&svq1_inter_multistage[i], 3, 8, + vlc_init(&svq1_inter_multistage[i], 3, 8, &ff_svq1_inter_multistage_vlc[i][0][1], 2, 1, &ff_svq1_inter_multistage_vlc[i][0][0], 2, 1, - INIT_VLC_USE_NEW_STATIC); + VLC_INIT_USE_STATIC); } - INIT_VLC_STATIC(&svq1_intra_mean, 8, 256, + VLC_INIT_STATIC(&svq1_intra_mean, 8, 256, &ff_svq1_intra_mean_vlc[0][1], 4, 2, &ff_svq1_intra_mean_vlc[0][0], 4, 2, 632); - INIT_VLC_STATIC(&svq1_inter_mean, 9, 512, + VLC_INIT_STATIC(&svq1_inter_mean, 9, 512, &ff_svq1_inter_mean_vlc[0][1], 4, 2, &ff_svq1_inter_mean_vlc[0][0], 4, 2, 1434); } |