libvpx: Pull from upstream

source/libvpx/vp9/encoder/vp9_treewriter.c

Index: source/libvpx/vp9/encoder/vp9_treewriter.c
===================================================================
--- source/libvpx/vp9/encoder/vp9_treewriter.c	(revision 263011)
+++ source/libvpx/vp9/encoder/vp9_treewriter.c	(working copy)
@@ -10,33 +10,6 @@
 
 #include "vp9/encoder/vp9_treewriter.h"
 
-static void cost(int *costs, vp9_tree tree, const vp9_prob *probs,
-                 int i, int c) {
-  const vp9_prob prob = probs[i / 2];
-  int b;
-
-  for (b = 0; b <= 1; ++b) {
-    const int cc = c + vp9_cost_bit(prob, b);
-    const vp9_tree_index ii = tree[i + b];
-
-    if (ii <= 0)
-      costs[-ii] = cc;
-    else
-      cost(costs, tree, probs, ii, cc);
-  }
-}
-
-void vp9_cost_tokens(int *costs, const vp9_prob *probs, vp9_tree tree) {
-  cost(costs, tree, probs, 0, 0);
-}
-
-void vp9_cost_tokens_skip(int *costs, const vp9_prob *probs, vp9_tree tree) {
-  assert(tree[0] <= 0 && tree[1] > 0);
-
-  costs[-tree[0]] = vp9_cost_bit(probs[0], 0);
-  cost(costs, tree, probs, 2, 0);
-}
-
 static void tree2tok(struct vp9_token *tokens, const vp9_tree_index *tree,
                      int i, int v, int l) {
   v += v;