summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg12.c
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2014-08-31 14:05:49 +0200
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2014-09-02 19:20:27 +0200
commit2ca78936c7d4862100b7eb9b4c6097b063d495c8 (patch)
treeaf3e195d60ac34b0533132dd38ecb472ba8bf06f /libavcodec/mpeg12.c
parent2c43cfe2d4051c14c18d904c830d4f0a2b1dbef1 (diff)
rl.h: remove deprecated and now unused vlc member.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diffstat (limited to 'libavcodec/mpeg12.c')
-rw-r--r--libavcodec/mpeg12.c13
1 files changed, 7 insertions, 6 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