Commit 2d80ce2b authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Change init_2d_vlc_rl() to not use *alloc_static().

Originally committed as revision 13566 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 573e8cb3
...@@ -80,16 +80,22 @@ static const enum PixelFormat pixfmt_xvmc_mpg2_420[] = { ...@@ -80,16 +80,22 @@ static const enum PixelFormat pixfmt_xvmc_mpg2_420[] = {
uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3]; uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];
#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,\
&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);\
}
static void init_2d_vlc_rl(RLTable *rl) static void init_2d_vlc_rl(RLTable *rl)
{ {
int i; int i;
init_vlc(&rl->vlc, TEX_VLC_BITS, rl->n + 2,
&rl->table_vlc[0][1], 4, 2,
&rl->table_vlc[0][0], 4, 2, 1);
rl->rl_vlc[0]= av_mallocz_static(rl->vlc.table_size*sizeof(RL_VLC_ELEM));
for(i=0; i<rl->vlc.table_size; i++){ for(i=0; i<rl->vlc.table_size; i++){
int code= rl->vlc.table[i][0]; int code= rl->vlc.table[i][0];
int len = rl->vlc.table[i][1]; int len = rl->vlc.table[i][1];
...@@ -178,8 +184,8 @@ static void init_vlcs(void) ...@@ -178,8 +184,8 @@ static void init_vlcs(void)
init_rl(&ff_rl_mpeg1, ff_mpeg12_static_rl_table_store[0]); init_rl(&ff_rl_mpeg1, ff_mpeg12_static_rl_table_store[0]);
init_rl(&ff_rl_mpeg2, ff_mpeg12_static_rl_table_store[1]); init_rl(&ff_rl_mpeg2, ff_mpeg12_static_rl_table_store[1]);
init_2d_vlc_rl(&ff_rl_mpeg1); INIT_2D_VLC_RL(ff_rl_mpeg1, 680);
init_2d_vlc_rl(&ff_rl_mpeg2); INIT_2D_VLC_RL(ff_rl_mpeg2, 674);
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment