virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

rl.h: remove deprecated and now unused vlc member.

Browse Source 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger
2014-08-31 14:05:49 +02:00
parent 2c43cfe2d4
commit 2ca78936c7
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/mpeg12.c
View File

@@ -70,21 +70,22 @@ static const uint8_t table_mb_btype[11][2] = {
#define INIT_2D_VLC_RL(rl, static_size)\ #define INIT_2D_VLC_RL(rl, static_size)\
{\ {\
static RL_VLC_ELEM rl_vlc_table[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][1], 4, 2,\
&rl.table_vlc[0][0], 4, 2, static_size);\ &rl.table_vlc[0][0], 4, 2, static_size);\
\ \
rl.rl_vlc[0] = rl_vlc_table;\ 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; int i;
for (i = 0; i < rl->vlc.table_size; i++) { for (i = 0; i < vlc->table_size; i++) {
int code = rl->vlc.table[i][0]; int code = vlc->table[i][0];
int len = rl->vlc.table[i][1]; int len = vlc->table[i][1];
int level, run; int level, run;
if (len == 0) { // illegal code if (len == 0) { // illegal code

8
libavcodec/mpegvideo.c
View File

@@ -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; int i, q;
@@ -1630,9 +1630,9 @@ av_cold void ff_init_vlc_rl(RLTable *rl)
qmul = 1; qmul = 1;
qadd = 0; qadd = 0;
} }
for (i = 0; i < rl->vlc.table_size; i++) { for (i = 0; i < vlc->table_size; i++) {
int code = rl->vlc.table[i][0]; int code = vlc->table[i][0];
int len = rl->vlc.table[i][1]; int len = vlc->table[i][1];
int level, run; int level, run;
if (len == 0) { // illegal code if (len == 0) { // illegal code

8
libavcodec/rl.h
View File

@@ -44,7 +44,6 @@ typedef struct RLTable {
uint8_t *index_run[2]; ///< encoding only uint8_t *index_run[2]; ///< encoding only
int8_t *max_level[2]; ///< encoding & decoding int8_t *max_level[2]; ///< encoding & decoding
int8_t *max_run[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 RL_VLC_ELEM *rl_vlc[32]; ///< decoding only
} RLTable; } RLTable;
@@ -54,13 +53,14 @@ typedef struct RLTable {
* the level and run tables, if this is NULL av_malloc() will be used * 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_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)\ #define INIT_VLC_RL(rl, static_size)\
{\ {\
int q;\ int q;\
static RL_VLC_ELEM rl_vlc_table[32][static_size];\ 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][1], 4, 2,\
&rl.table_vlc[0][0], 4, 2, static_size);\ &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++)\ for(q=0; q<32; q++)\
rl.rl_vlc[q]= rl_vlc_table[q];\ rl.rl_vlc[q]= rl_vlc_table[q];\
\ \
ff_init_vlc_rl(&rl);\ ff_init_vlc_rl(&rl, &tmp_vlc);\
}\ }\
} }