Mercurial > libavcodec.hg
diff mpeg4videodec.c @ 10818:514dc1c87b2e libavcodec
Rename most non static h263 tables so their name contains h263.
author | michael |
---|---|
date | Fri, 08 Jan 2010 17:51:48 +0000 |
parents | d1fe22d92a65 |
children | 77b3f322dba8 |
line wrap: on
line diff
--- a/mpeg4videodec.c Fri Jan 08 17:41:14 2010 +0000 +++ b/mpeg4videodec.c Fri Jan 08 17:51:48 2010 +0000 @@ -556,7 +556,7 @@ return mb_num-1; } - cbpc = get_vlc2(&s->gb, intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2); + cbpc = get_vlc2(&s->gb, ff_h263_intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2); if (cbpc < 0){ av_log(s->avctx, AV_LOG_ERROR, "cbpc corrupted at %d %d\n", s->mb_x, s->mb_y); return -1; @@ -615,7 +615,7 @@ continue; } - cbpc = get_vlc2(&s->gb, inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2); + cbpc = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2); if (cbpc < 0){ av_log(s->avctx, AV_LOG_ERROR, "cbpc corrupted at %d %d\n", s->mb_x, s->mb_y); return -1; @@ -712,7 +712,7 @@ if(s->pict_type==FF_I_TYPE){ int ac_pred= get_bits1(&s->gb); - int cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); + int cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1); if(cbpy<0){ av_log(s->avctx, AV_LOG_ERROR, "cbpy corrupted at %d %d\n", s->mb_x, s->mb_y); return -1; @@ -724,7 +724,7 @@ if(IS_INTRA(s->current_picture.mb_type[xy])){ int dir=0,i; int ac_pred = get_bits1(&s->gb); - int cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); + int cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1); if(cbpy<0){ av_log(s->avctx, AV_LOG_ERROR, "I cbpy corrupted at %d %d\n", s->mb_x, s->mb_y); @@ -754,7 +754,7 @@ s->current_picture.qscale_table[xy]= s->qscale; s->cbp_table[xy]= 0; }else{ - int cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); + int cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1); if(cbpy<0){ av_log(s->avctx, AV_LOG_ERROR, "P cbpy corrupted at %d %d\n", s->mb_x, s->mb_y); @@ -892,7 +892,7 @@ return 0; } if(rvlc) rl = &rvlc_rl_inter; - else rl = &rl_inter; + else rl = &ff_h263_rl_inter; scan_table = s->intra_scantable.permutated; @@ -902,7 +902,7 @@ if(rvlc){ rl_vlc = rvlc_rl_inter.rl_vlc[0]; }else{ - rl_vlc = rl_inter.rl_vlc[0]; + rl_vlc = ff_h263_rl_inter.rl_vlc[0]; } }else{ qmul = s->qscale << 1; @@ -910,7 +910,7 @@ if(rvlc){ rl_vlc = rvlc_rl_inter.rl_vlc[s->qscale]; }else{ - rl_vlc = rl_inter.rl_vlc[s->qscale]; + rl_vlc = ff_h263_rl_inter.rl_vlc[s->qscale]; } } } @@ -1207,7 +1207,7 @@ } goto end; } - cbpc = get_vlc2(&s->gb, inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2); + cbpc = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2); if (cbpc < 0){ av_log(s->avctx, AV_LOG_ERROR, "cbpc damaged at %d %d\n", s->mb_x, s->mb_y); return -1; @@ -1222,7 +1222,7 @@ if(s->pict_type==FF_S_TYPE && s->vol_sprite_usage==GMC_SPRITE && (cbpc & 16) == 0) s->mcsel= get_bits1(&s->gb); else s->mcsel= 0; - cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1) ^ 0x0F; + cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1) ^ 0x0F; cbp = (cbpc & 3) | (cbpy << 2); if (dquant) { @@ -1438,7 +1438,7 @@ s->current_picture.mb_type[xy]= mb_type; } else { /* I-Frame */ do{ - cbpc = get_vlc2(&s->gb, intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2); + cbpc = get_vlc2(&s->gb, ff_h263_intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2); if (cbpc < 0){ av_log(s->avctx, AV_LOG_ERROR, "I cbpc damaged at %d %d\n", s->mb_x, s->mb_y); return -1; @@ -1454,7 +1454,7 @@ else s->current_picture.mb_type[xy]= MB_TYPE_INTRA; - cbpy = get_vlc2(&s->gb, cbpy_vlc.table, CBPY_VLC_BITS, 1); + cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1); if(cbpy<0){ av_log(s->avctx, AV_LOG_ERROR, "I cbpy damaged at %d %d\n", s->mb_x, s->mb_y); return -1;