From 5b65246a717f529882bceb7cf4c05321cbc38dc0 Mon Sep 17 00:00:00 2001
From: Dmitry Kovalev <dkovalev@google.com>
Date: Wed, 31 Jul 2013 18:51:18 -0700
Subject: [PATCH] Adding missing const to vp9_extra_bits array.
Change-Id: Icd128ab58719e0b9066bdfa66a5d0d427a84d6df
---
vp9/common/vp9_entropy.c | 2 +-
vp9/common/vp9_entropy.h | 2 +-
vp9/encoder/vp9_tokenize.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/vp9/common/vp9_entropy.c b/vp9/common/vp9_entropy.c
index c7733ad042..df3a9fed53 100644
--- a/vp9/common/vp9_entropy.c
+++ b/vp9/common/vp9_entropy.c
@@ -419,7 +419,7 @@ static void init_bit_trees() {
init_bit_tree(cat6, 14);
}
-vp9_extra_bit vp9_extra_bits[12] = {
+const vp9_extra_bit vp9_extra_bits[12] = {
{ 0, 0, 0, 0},
{ 0, 0, 0, 1},
{ 0, 0, 0, 2},
diff --git a/vp9/common/vp9_entropy.h b/vp9/common/vp9_entropy.h
index 9fa1fc60d9..861c0786c8 100644
--- a/vp9/common/vp9_entropy.h
+++ b/vp9/common/vp9_entropy.h
@@ -50,7 +50,7 @@ typedef struct {
int base_val;
} vp9_extra_bit;
-extern vp9_extra_bit vp9_extra_bits[12]; /* indexed by token value */
+extern const vp9_extra_bit vp9_extra_bits[12]; /* indexed by token value */
#define MAX_PROB 255
#define DCT_MAX_VALUE 16384
diff --git a/vp9/encoder/vp9_tokenize.c b/vp9/encoder/vp9_tokenize.c
index 27831aa22f..0a42a32aea 100644
--- a/vp9/encoder/vp9_tokenize.c
+++ b/vp9/encoder/vp9_tokenize.c
@@ -40,7 +40,7 @@ const int *vp9_dct_value_cost_ptr;
static void fill_value_tokens() {
TOKENVALUE *const t = dct_value_tokens + DCT_MAX_VALUE;
- vp9_extra_bit *const e = vp9_extra_bits;
+ const vp9_extra_bit *const e = vp9_extra_bits;
int i = -DCT_MAX_VALUE;
int sign = 1;
@@ -69,7 +69,7 @@ static void fill_value_tokens() {
// initialize the cost for extra bits for all possible coefficient value.
{
int cost = 0;
- 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;
--
GitLab