diff options
author | James Zern <jzern@google.com> | 2015-06-15 23:02:35 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-06-15 23:02:36 +0000 |
commit | e8d3491ec25b28e5a1a0d6c771109441f460e37a (patch) | |
tree | 48554444cca8de14c3a4e3f57f3f01eef584099b /vp9 | |
parent | 43d49e4710f2f8e58e259e39305563d8fb490c5a (diff) | |
parent | 53b7f33f2d3be506ad3b4f20a7a1227c21569732 (diff) | |
download | libvpx-e8d3491ec25b28e5a1a0d6c771109441f460e37a.tar libvpx-e8d3491ec25b28e5a1a0d6c771109441f460e37a.tar.gz libvpx-e8d3491ec25b28e5a1a0d6c771109441f460e37a.tar.bz2 libvpx-e8d3491ec25b28e5a1a0d6c771109441f460e37a.zip |
Merge "vp9_entropymode: make vp9_init_mode_probs private"
Diffstat (limited to 'vp9')
-rw-r--r-- | vp9/common/vp9_entropymode.c | 4 | ||||
-rw-r--r-- | vp9/common/vp9_entropymode.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c index 424451fee..22d431bb2 100644 --- a/vp9/common/vp9_entropymode.c +++ b/vp9/common/vp9_entropymode.c @@ -314,7 +314,7 @@ static const vp9_prob default_switchable_interp_prob[SWITCHABLE_FILTER_CONTEXTS] { 149, 144, }, }; -void vp9_init_mode_probs(FRAME_CONTEXT *fc) { +static void init_mode_probs(FRAME_CONTEXT *fc) { vp9_copy(fc->uv_mode_prob, default_if_uv_probs); vp9_copy(fc->y_mode_prob, default_if_y_probs); vp9_copy(fc->switchable_interp_prob, default_switchable_interp_prob); @@ -444,7 +444,7 @@ void vp9_setup_past_independence(VP9_COMMON *cm) { lf->last_sharpness_level = -1; vp9_default_coef_probs(cm); - vp9_init_mode_probs(cm->fc); + init_mode_probs(cm->fc); vp9_init_mv_probs(cm); cm->fc->initialized = 1; diff --git a/vp9/common/vp9_entropymode.h b/vp9/common/vp9_entropymode.h index a0619ec6f..8c9e6a731 100644 --- a/vp9/common/vp9_entropymode.h +++ b/vp9/common/vp9_entropymode.h @@ -90,8 +90,6 @@ extern const vp9_tree_index vp9_switchable_interp_tree void vp9_setup_past_independence(struct VP9Common *cm); -void vp9_init_mode_probs(FRAME_CONTEXT *fc); - void vp9_adapt_mode_probs(struct VP9Common *cm); void tx_counts_to_branch_counts_32x32(const unsigned int *tx_count_32x32p, |