Merge "treecoder lint issues resolved"

This commit is contained in:
Jim Bankoski
2013-09-30 10:43:22 -07:00
committed by Gerrit Code Review

View File

@@ -25,8 +25,9 @@ static void tree2tok(struct vp9_token *const p, vp9_tree t,
if (j <= 0) { if (j <= 0) {
p[-j].value = v; p[-j].value = v;
p[-j].len = l; p[-j].len = l;
} else } else {
tree2tok(p, t, j, v, l); tree2tok(p, t, j, v, l);
}
} while (++v & 1); } while (++v & 1);
} }
@@ -65,11 +66,9 @@ static unsigned int convert_distribution(unsigned int i,
return left + right; return left + right;
} }
void vp9_tree_probs_from_distribution( void vp9_tree_probs_from_distribution(vp9_tree tree, vp9_prob probs[/* n-1 */],
vp9_tree tree, unsigned int branch_ct[/* n-1 */][2],
vp9_prob probs [ /* n-1 */ ], const unsigned int num_events[/* n */],
unsigned int branch_ct [ /* n-1 */ ] [2],
const unsigned int num_events[ /* n */ ],
unsigned int tok0_offset) { unsigned int tok0_offset) {
convert_distribution(0, tree, probs, branch_ct, num_events, tok0_offset); convert_distribution(0, tree, probs, branch_ct, num_events, tok0_offset);
} }