summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Bankoski <jimbankoski@google.com>2013-09-30 10:43:22 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2013-09-30 10:43:22 -0700
commit509ba989381781f17a8ce7ed9efc342e7b166a1b (patch)
tree5b3f353758217a0d27e1186383cdef2bb7843944
parent7ddd9f7f2727dbd681c3a3cf78e842fd64fecb3f (diff)
parentc66bfc70d15edc6c219c85e85ee458477cbe915a (diff)
downloadlibvpx-509ba989381781f17a8ce7ed9efc342e7b166a1b.tar
libvpx-509ba989381781f17a8ce7ed9efc342e7b166a1b.tar.gz
libvpx-509ba989381781f17a8ce7ed9efc342e7b166a1b.tar.bz2
libvpx-509ba989381781f17a8ce7ed9efc342e7b166a1b.zip
Merge "treecoder lint issues resolved"
-rw-r--r--vp9/common/vp9_treecoder.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/vp9/common/vp9_treecoder.c b/vp9/common/vp9_treecoder.c
index 2e21a5b30..da1213d71 100644
--- a/vp9/common/vp9_treecoder.c
+++ b/vp9/common/vp9_treecoder.c
@@ -25,8 +25,9 @@ static void tree2tok(struct vp9_token *const p, vp9_tree t,
if (j <= 0) {
p[-j].value = v;
p[-j].len = l;
- } else
+ } else {
tree2tok(p, t, j, v, l);
+ }
} while (++v & 1);
}
@@ -65,11 +66,9 @@ static unsigned int convert_distribution(unsigned int i,
return left + right;
}
-void vp9_tree_probs_from_distribution(
- vp9_tree tree,
- vp9_prob probs [ /* n-1 */ ],
- unsigned int branch_ct [ /* n-1 */ ] [2],
- const unsigned int num_events[ /* n */ ],
- unsigned int tok0_offset) {
+void vp9_tree_probs_from_distribution(vp9_tree tree, vp9_prob probs[/* n-1 */],
+ unsigned int branch_ct[/* n-1 */][2],
+ const unsigned int num_events[/* n */],
+ unsigned int tok0_offset) {
convert_distribution(0, tree, probs, branch_ct, num_events, tok0_offset);
}