Mercurial > libavcodec.hg
comparison mpeg4videodec.c @ 10817:d1fe22d92a65 libavcodec
Rename mpeg4 intra vlc tables so they contain "mpeg4", this improves readability
of msmpeg4 code (one now knows where that table comes from).
| author | michael |
|---|---|
| date | Fri, 08 Jan 2010 17:41:14 +0000 |
| parents | 9abebeca7d1b |
| children | 514dc1c87b2e |
comparison
equal
deleted
inserted
replaced
| 10816:9abebeca7d1b | 10817:d1fe22d92a65 |
|---|---|
| 870 | 870 |
| 871 if(rvlc){ | 871 if(rvlc){ |
| 872 rl = &rvlc_rl_intra; | 872 rl = &rvlc_rl_intra; |
| 873 rl_vlc = rvlc_rl_intra.rl_vlc[0]; | 873 rl_vlc = rvlc_rl_intra.rl_vlc[0]; |
| 874 }else{ | 874 }else{ |
| 875 rl = &rl_intra; | 875 rl = &ff_mpeg4_rl_intra; |
| 876 rl_vlc = rl_intra.rl_vlc[0]; | 876 rl_vlc = ff_mpeg4_rl_intra.rl_vlc[0]; |
| 877 } | 877 } |
| 878 if (s->ac_pred) { | 878 if (s->ac_pred) { |
| 879 if (dc_pred_dir == 0) | 879 if (dc_pred_dir == 0) |
| 880 scan_table = s->intra_v_scantable.permutated; /* left */ | 880 scan_table = s->intra_v_scantable.permutated; /* left */ |
| 881 else | 881 else |
| 2198 return ret; | 2198 return ret; |
| 2199 | 2199 |
| 2200 if (!done) { | 2200 if (!done) { |
| 2201 done = 1; | 2201 done = 1; |
| 2202 | 2202 |
| 2203 init_rl(&rl_intra, ff_mpeg4_static_rl_table_store[0]); | 2203 init_rl(&ff_mpeg4_rl_intra, ff_mpeg4_static_rl_table_store[0]); |
| 2204 init_rl(&rvlc_rl_inter, ff_mpeg4_static_rl_table_store[1]); | 2204 init_rl(&rvlc_rl_inter, ff_mpeg4_static_rl_table_store[1]); |
| 2205 init_rl(&rvlc_rl_intra, ff_mpeg4_static_rl_table_store[2]); | 2205 init_rl(&rvlc_rl_intra, ff_mpeg4_static_rl_table_store[2]); |
| 2206 INIT_VLC_RL(rl_intra, 554); | 2206 INIT_VLC_RL(ff_mpeg4_rl_intra, 554); |
| 2207 INIT_VLC_RL(rvlc_rl_inter, 1072); | 2207 INIT_VLC_RL(rvlc_rl_inter, 1072); |
| 2208 INIT_VLC_RL(rvlc_rl_intra, 1072); | 2208 INIT_VLC_RL(rvlc_rl_intra, 1072); |
| 2209 INIT_VLC_STATIC(&dc_lum, DC_VLC_BITS, 10 /* 13 */, | 2209 INIT_VLC_STATIC(&dc_lum, DC_VLC_BITS, 10 /* 13 */, |
| 2210 &ff_mpeg4_DCtab_lum[0][1], 2, 1, | 2210 &ff_mpeg4_DCtab_lum[0][1], 2, 1, |
| 2211 &ff_mpeg4_DCtab_lum[0][0], 2, 1, 512); | 2211 &ff_mpeg4_DCtab_lum[0][0], 2, 1, 512); |