virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

simplify

Browse Source 
Originally committed as revision 8911 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Loren Merritt 2007-05-06 09:17:50 +00:00
parent 44c560003a
commit 4b8419aa7f
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/vp6.c
View File

@ -299,11 +299,6 @@ static void vp6_parse_coeff(vp56_context_t *s)
for (coeff_idx=0; coeff_idx<64; ) { for (coeff_idx=0; coeff_idx<64; ) {
if ((coeff_idx>1 && ct==0) || vp56_rac_get_prob(c, model2[0])) { if ((coeff_idx>1 && ct==0) || vp56_rac_get_prob(c, model2[0])) {
/* parse a coeff */ /* parse a coeff */
if (coeff_idx == 0) {
s->left_block[vp56_b6to4[b]].not_null_dc = 1;
s->above_blocks[s->above_block_idx[b]].not_null_dc = 1;
}
if (vp56_rac_get_prob(c, model2[2])) { if (vp56_rac_get_prob(c, model2[2])) {
if (vp56_rac_get_prob(c, model2[3])) { if (vp56_rac_get_prob(c, model2[3])) {
idx = vp56_rac_get_tree(c, vp56_pc_tree, model); idx = vp56_rac_get_tree(c, vp56_pc_tree, model);
@ -331,10 +326,7 @@ static void vp6_parse_coeff(vp56_context_t *s)
} else { } else {
/* parse a run */ /* parse a run */
ct = 0; ct = 0;
if (coeff_idx == 0) { if (coeff_idx > 0) {
s->left_block[vp56_b6to4[b]].not_null_dc = 0;
s->above_blocks[s->above_block_idx[b]].not_null_dc = 0;
} else {
if (!vp56_rac_get_prob(c, model2[1])) if (!vp56_rac_get_prob(c, model2[1]))
break; break;
@ -349,6 +341,9 @@ static void vp6_parse_coeff(vp56_context_t *s)
cg = vp6_coeff_groups[coeff_idx+=run]; cg = vp6_coeff_groups[coeff_idx+=run];
model = model2 = s->coeff_model_ract[pt][ct][cg]; model = model2 = s->coeff_model_ract[pt][ct][cg];
} }
s->left_block[vp56_b6to4[b]].not_null_dc =
s->above_blocks[s->above_block_idx[b]].not_null_dc = !!s->block_coeff[b][0];
} }
} }