shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9_entropymode: make vp9_init_mode_probs private"

--- a/vp9/common/vp9_entropymode.c

+++ b/vp9/common/vp9_entropymode.c

@@ -314,7 +314,7 @@

   { 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 @@

   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;

--- a/vp9/common/vp9_entropymode.h

+++ b/vp9/common/vp9_entropymode.h

@@ -90,8 +90,6 @@

 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,