From: Yaowu Xu <yaowu@google.com>
Date: Sun, 20 Apr 2014 21:04:53 +0000 (-0700)
Subject: Remove an unused function
X-Git-Tag: v1.4.0~1753^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bae205fd6a9e963d16a580d83e1e6faf6e143764;p=platform%2Fupstream%2Flibvpx.git

Remove an unused function

Change-Id: I0f2592ecfc5197dfb94975260cb2f862315e7895
---

diff --git a/vp9/decoder/vp9_dsubexp.c b/vp9/decoder/vp9_dsubexp.c
index e67b372..c22617e 100644
--- a/vp9/decoder/vp9_dsubexp.c
+++ b/vp9/decoder/vp9_dsubexp.c
@@ -26,22 +26,6 @@ static int decode_uniform(vp9_reader *r) {
   return v < m ?  v : (v << 1) - m + vp9_read_bit(r);
 }
 
-
-static int merge_index(int v, int n, int modulus) {
-  int max1 = (n - 1 - modulus / 2) / modulus + 1;
-  if (v < max1) {
-    v = v * modulus + modulus / 2;
-  } else {
-    int w;
-    v -= max1;
-    w = v;
-    v += (v + modulus - modulus / 2) / modulus;
-    while (v % modulus == modulus / 2 ||
-           w != v - (v + modulus - modulus / 2) / modulus) v++;
-  }
-  return v;
-}
-
 static int inv_remap_prob(int v, int m) {
   static int inv_map_table[MAX_PROB - 1] = {
       6,  19,  32,  45,  58,  71,  84,  97, 110, 123, 136, 149, 162, 175, 188,