diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2012-10-31 10:04:03 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-10-31 10:04:03 -0700 |
| commit | fbbd3e1832fd66f332e6d02c6a660f91ae7f072e (patch) | |
| tree | 535f68b7fb6ae341898db6a7fbdca4fda1cbedde /vp8/common/treecoder.c | |
| parent | b8e9617ee88dbd27bd02425d1b3953294d4bddfc (diff) | |
| parent | 9bc5f3e3afdbe2b96b55fdcb57470b70d6cfb6d5 (diff) | |
| download | libvpx-fbbd3e1832fd66f332e6d02c6a660f91ae7f072e.tar libvpx-fbbd3e1832fd66f332e6d02c6a660f91ae7f072e.tar.gz libvpx-fbbd3e1832fd66f332e6d02c6a660f91ae7f072e.tar.bz2 libvpx-fbbd3e1832fd66f332e6d02c6a660f91ae7f072e.zip | |
Merge "Change common vp8_ public symbol prefixes to vp9_." into experimental
Diffstat (limited to 'vp8/common/treecoder.c')
| -rw-r--r-- | vp8/common/treecoder.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp8/common/treecoder.c b/vp8/common/treecoder.c index adf291bef..6845f11c4 100644 --- a/vp8/common/treecoder.c +++ b/vp8/common/treecoder.c @@ -39,11 +39,11 @@ static void tree2tok( } while (++v & 1); } -void vp8_tokens_from_tree(struct vp8_token_struct *p, vp8_tree t) { +void vp9_tokens_from_tree(struct vp8_token_struct *p, vp8_tree t) { tree2tok(p, t, 0, 0, 0); } -void vp8_tokens_from_tree_offset(struct vp8_token_struct *p, vp8_tree t, +void vp9_tokens_from_tree_offset(struct vp8_token_struct *p, vp8_tree t, int offset) { tree2tok(p - offset, t, 0, 0, 0); } @@ -94,7 +94,7 @@ static void branch_counts( } -void vp8_tree_probs_from_distribution( +void vp9_tree_probs_from_distribution( int n, /* n = size of alphabet */ vp8_token tok [ /* n */ ], vp8_tree tree, @@ -125,7 +125,7 @@ void vp8_tree_probs_from_distribution( } while (++t < tree_len); } -vp8_prob vp8_bin_prob_from_distribution(const unsigned int counts[2]) { +vp8_prob vp9_bin_prob_from_distribution(const unsigned int counts[2]) { int tot_count = counts[0] + counts[1]; vp8_prob prob; if (tot_count) { |