diff options
| author | Yaowu Xu <yaowu@google.com> | 2015-07-21 04:09:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-21 04:09:53 +0000 |
| commit | 41c13ddbc93d45a7968813016298209d21fda351 (patch) | |
| tree | 6438aa971f8e8438acf893436a8f065862539033 /vpx_dsp/prob.c | |
| parent | 0fc4d4e1ef33f6ca9590e53b5fb98787363f0f54 (diff) | |
| parent | 70ad66805608f711f493a31e19554992206a8f31 (diff) | |
| download | libvpx-41c13ddbc93d45a7968813016298209d21fda351.tar libvpx-41c13ddbc93d45a7968813016298209d21fda351.tar.gz libvpx-41c13ddbc93d45a7968813016298209d21fda351.tar.bz2 libvpx-41c13ddbc93d45a7968813016298209d21fda351.zip | |
Merge "vpx_dsp/prob.h: vp9_ -> vpx_"
Diffstat (limited to 'vpx_dsp/prob.c')
| -rw-r--r-- | vpx_dsp/prob.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vpx_dsp/prob.c b/vpx_dsp/prob.c index b88f0e4cf..639d24dd2 100644 --- a/vpx_dsp/prob.c +++ b/vpx_dsp/prob.c @@ -10,7 +10,7 @@ #include "./prob.h" -const uint8_t vp9_norm[256] = { +const uint8_t vpx_norm[256] = { 0, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -30,7 +30,7 @@ const uint8_t vp9_norm[256] = { }; static unsigned int tree_merge_probs_impl(unsigned int i, - const vp9_tree_index *tree, + const vpx_tree_index *tree, const vpx_prob *pre_probs, const unsigned int *counts, vpx_prob *probs) { @@ -47,7 +47,7 @@ static unsigned int tree_merge_probs_impl(unsigned int i, return left_count + right_count; } -void vp9_tree_merge_probs(const vp9_tree_index *tree, const vpx_prob *pre_probs, +void vpx_tree_merge_probs(const vpx_tree_index *tree, const vpx_prob *pre_probs, const unsigned int *counts, vpx_prob *probs) { tree_merge_probs_impl(0, tree, pre_probs, counts, probs); } |