From 2ca78936c7d4862100b7eb9b4c6097b063d495c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Sun, 31 Aug 2014 14:05:49 +0200 Subject: [PATCH] rl.h: remove deprecated and now unused vlc member. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Reimar Döffinger --- libavcodec/mpeg12.c | 13 +++++++------ libavcodec/mpegvideo.c | 8 ++++---- libavcodec/rl.h | 8 ++++---- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 27d680fd85..cb00baf809 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -70,21 +70,22 @@ static const uint8_t table_mb_btype[11][2] = { #define INIT_2D_VLC_RL(rl, static_size)\ {\ static RL_VLC_ELEM rl_vlc_table[static_size];\ - INIT_VLC_STATIC(&rl.vlc, TEX_VLC_BITS, rl.n + 2,\ + VLC tmp_vlc;\ + INIT_VLC_STATIC(&tmp_vlc, TEX_VLC_BITS, rl.n + 2,\ &rl.table_vlc[0][1], 4, 2,\ &rl.table_vlc[0][0], 4, 2, static_size);\ \ rl.rl_vlc[0] = rl_vlc_table;\ - init_2d_vlc_rl(&rl);\ + init_2d_vlc_rl(&rl, &tmp_vlc);\ } -static av_cold void init_2d_vlc_rl(RLTable *rl) +static av_cold void init_2d_vlc_rl(RLTable *rl, const VLC *vlc) { int i; - for (i = 0; i < rl->vlc.table_size; i++) { - int code = rl->vlc.table[i][0]; - int len = rl->vlc.table[i][1]; + for (i = 0; i < vlc->table_size; i++) { + int code = vlc->table[i][0]; + int len = vlc->table[i][1]; int level, run; if (len == 0) { // illegal code diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 3ec81cef52..748dbc8d28 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1618,7 +1618,7 @@ av_cold void ff_init_rl(RLTable *rl, } } -av_cold void ff_init_vlc_rl(RLTable *rl) +av_cold void ff_init_vlc_rl(RLTable *rl, const VLC *vlc) { int i, q; @@ -1630,9 +1630,9 @@ av_cold void ff_init_vlc_rl(RLTable *rl) qmul = 1; qadd = 0; } - for (i = 0; i < rl->vlc.table_size; i++) { - int code = rl->vlc.table[i][0]; - int len = rl->vlc.table[i][1]; + for (i = 0; i < vlc->table_size; i++) { + int code = vlc->table[i][0]; + int len = vlc->table[i][1]; int level, run; if (len == 0) { // illegal code diff --git a/libavcodec/rl.h b/libavcodec/rl.h index c80283db7f..3cef366251 100644 --- a/libavcodec/rl.h +++ b/libavcodec/rl.h @@ -44,7 +44,6 @@ typedef struct RLTable { uint8_t *index_run[2]; ///< encoding only int8_t *max_level[2]; ///< encoding & decoding int8_t *max_run[2]; ///< encoding & decoding - VLC vlc; ///< decoding only deprecated FIXME remove RL_VLC_ELEM *rl_vlc[32]; ///< decoding only } RLTable; @@ -54,13 +53,14 @@ typedef struct RLTable { * the level and run tables, if this is NULL av_malloc() will be used */ void ff_init_rl(RLTable *rl, uint8_t static_store[2][2*MAX_RUN + MAX_LEVEL + 3]); -void ff_init_vlc_rl(RLTable *rl); +void ff_init_vlc_rl(RLTable *rl, const VLC *vlc); #define INIT_VLC_RL(rl, static_size)\ {\ int q;\ static RL_VLC_ELEM rl_vlc_table[32][static_size];\ - INIT_VLC_STATIC(&rl.vlc, 9, rl.n + 1,\ + VLC tmp_vlc;\ + INIT_VLC_STATIC(&tmp_vlc, 9, rl.n + 1,\ &rl.table_vlc[0][1], 4, 2,\ &rl.table_vlc[0][0], 4, 2, static_size);\ \ @@ -68,7 +68,7 @@ void ff_init_vlc_rl(RLTable *rl); for(q=0; q<32; q++)\ rl.rl_vlc[q]= rl_vlc_table[q];\ \ - ff_init_vlc_rl(&rl);\ + ff_init_vlc_rl(&rl, &tmp_vlc);\ }\ }