From: Dmitry Kovalev Date: Thu, 1 Aug 2013 01:51:18 +0000 (-0700) Subject: Adding missing const to vp9_extra_bits array. X-Git-Tag: v1.3.0~704^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b65246a717f529882bceb7cf4c05321cbc38dc0;p=libvpx Adding missing const to vp9_extra_bits array. Change-Id: Icd128ab58719e0b9066bdfa66a5d0d427a84d6df --- diff --git a/vp9/common/vp9_entropy.c b/vp9/common/vp9_entropy.c index c7733ad04..df3a9fed5 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 9fa1fc60d..861c0786c 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 27831aa22..0a42a32ae 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;