shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Adding missing const to vp9_extra_bits array."

--- a/vp9/common/vp9_entropy.c

+++ b/vp9/common/vp9_entropy.c

@@ -419,7 +419,7 @@

   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},

--- a/vp9/common/vp9_entropy.h

+++ b/vp9/common/vp9_entropy.h

@@ -50,7 +50,7 @@

   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

--- a/vp9/encoder/vp9_tokenize.c

+++ b/vp9/encoder/vp9_tokenize.c

@@ -40,7 +40,7 @@

 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 @@

     // 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;

-- 

⑨