summaryrefslogtreecommitdiffstats
path: root/libvpx/vp9/encoder/vp9_tokenize.c
diff options
context:
space:
mode:
authorhkuang <hkuang@google.com>2013-11-14 16:48:58 -0800
committerhkuang <hkuang@google.com>2013-11-14 16:48:58 -0800
commit9b35249446b07f40ac5fcc3205f2c048616efacc (patch)
treefe2ffa7c55b8d1f84a3e97e7fd68a0d484d669dc /libvpx/vp9/encoder/vp9_tokenize.c
parent5ae7ac49f08a179e4f054d99fcfc9dce78d26e58 (diff)
downloadandroid_external_libvpx-9b35249446b07f40ac5fcc3205f2c048616efacc.tar.gz
android_external_libvpx-9b35249446b07f40ac5fcc3205f2c048616efacc.tar.bz2
android_external_libvpx-9b35249446b07f40ac5fcc3205f2c048616efacc.zip
Roll latest libvpx to fix scalling bug.
Checkout is from master:Ib748eb287520c794631697204da6ebe19523ce95 Bug: 11690668 Change-Id: Ia2bde2e50feca81556563ad3797e4972748e2041
Diffstat (limited to 'libvpx/vp9/encoder/vp9_tokenize.c')
-rw-r--r--libvpx/vp9/encoder/vp9_tokenize.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libvpx/vp9/encoder/vp9_tokenize.c b/libvpx/vp9/encoder/vp9_tokenize.c
index 7d4676e..c7336d0 100644
--- a/libvpx/vp9/encoder/vp9_tokenize.c
+++ b/libvpx/vp9/encoder/vp9_tokenize.c
@@ -57,7 +57,7 @@ static void fill_value_tokens() {
// initialize the cost for extra bits for all possible coefficient value.
{
int cost = 0;
- const vp9_extra_bit *p = vp9_extra_bits + t[i].token;
+ const vp9_extra_bit *p = &vp9_extra_bits[t[i].token];
if (p->base_val) {
const int extra = t[i].extra;
@@ -73,7 +73,7 @@ static void fill_value_tokens() {
} while (++i < DCT_MAX_VALUE);
vp9_dct_value_tokens_ptr = dct_value_tokens + DCT_MAX_VALUE;
- vp9_dct_value_cost_ptr = dct_value_cost + DCT_MAX_VALUE;
+ vp9_dct_value_cost_ptr = dct_value_cost + DCT_MAX_VALUE;
}
struct tokenize_b_args {
@@ -127,7 +127,7 @@ static void tokenize_b(int plane, int block, BLOCK_SIZE plane_bsize,
get_scan(xd, tx_size, type, block, &scan, &nb);
c = 0;
do {
- const int band = get_coef_band(band_translate, c);
+ const int band = band_translate[c];
int token;
int v = 0;
rc = scan[c];