[Backport] Fix libvpx build

Merges Debian patch that fixes the compiler error:
'invalid use of array with unspecified bounds'

Change-Id: If3ff385a78ccb63d8df6ed2e1c9944f20d616d24
Reviewed-by: Michael Brüning <[email protected]>

Author: carewolf

chromium/third_party/libvpx/source/libvpx/vp8/common/treecoder.c

@@ -18,7 +18,7 @@
 
 static void tree2tok(
     struct vp8_token_struct *const p,
-    vp8_tree t,
+    vp8_tree_p t,
     int i,
     int v,
     int L
@@ -42,12 +42,12 @@ static void tree2tok(
     while (++v & 1);
 }
 
-void vp8_tokens_from_tree(struct vp8_token_struct *p, vp8_tree t)
+void vp8_tokens_from_tree(struct vp8_token_struct *p, vp8_tree_p t)
 {
     tree2tok(p, t, 0, 0, 0);
 }
 
-void vp8_tokens_from_tree_offset(struct vp8_token_struct *p, vp8_tree t,
+void vp8_tokens_from_tree_offset(struct vp8_token_struct *p, vp8_tree_p t,
                                  int offset)
 {
     tree2tok(p - offset, t, 0, 0, 0);
@@ -56,7 +56,7 @@ void vp8_tokens_from_tree_offset(struct vp8_token_struct *p, vp8_tree t,
 static void branch_counts(
     int n,                      /* n = size of alphabet */
     vp8_token tok               [ /* n */ ],
-    vp8_tree tree,
+    vp8_tree_p tree,
     unsigned int branch_ct       [ /* n-1 */ ] [2],
     const unsigned int num_events[ /* n */ ]
 )
@@ -109,7 +109,7 @@ static void branch_counts(
 void vp8_tree_probs_from_distribution(
     int n,                      /* n = size of alphabet */
     vp8_token tok               [ /* n */ ],
-    vp8_tree tree,
+    vp8_tree_p tree,
     vp8_prob probs          [ /* n-1 */ ],
     unsigned int branch_ct       [ /* n-1 */ ] [2],
     const unsigned int num_events[ /* n */ ],

chromium/third_party/libvpx/source/libvpx/vp8/common/treecoder.h

@@ -57,8 +57,8 @@ typedef const struct vp8_token_struct
 
 /* Construct encoding array from tree. */
 
-void vp8_tokens_from_tree(struct vp8_token_struct *, vp8_tree);
-void vp8_tokens_from_tree_offset(struct vp8_token_struct *, vp8_tree,
+void vp8_tokens_from_tree(struct vp8_token_struct *, vp8_tree_p);
+void vp8_tokens_from_tree_offset(struct vp8_token_struct *, vp8_tree_p,
                                  int offset);
 
 
@@ -70,7 +70,7 @@ void vp8_tokens_from_tree_offset(struct vp8_token_struct *, vp8_tree,
 void vp8_tree_probs_from_distribution(
     int n,                      /* n = size of alphabet */
     vp8_token tok               [ /* n */ ],
-    vp8_tree tree,
+    vp8_tree_p tree,
     vp8_prob probs          [ /* n-1 */ ],
     unsigned int branch_ct       [ /* n-1 */ ] [2],
     const unsigned int num_events[ /* n */ ],
@@ -83,7 +83,7 @@ void vp8_tree_probs_from_distribution(
 void vp8bc_tree_probs_from_distribution(
     int n,                      /* n = size of alphabet */
     vp8_token tok               [ /* n */ ],
-    vp8_tree tree,
+    vp8_tree_p tree,
     vp8_prob probs          [ /* n-1 */ ],
     unsigned int branch_ct       [ /* n-1 */ ] [2],
     const unsigned int num_events[ /* n */ ],

chromium/third_party/libvpx/source/libvpx/vp8/decoder/treereader.h

@@ -30,7 +30,7 @@ typedef BOOL_DECODER vp8_reader;
 
 static int vp8_treed_read(
     vp8_reader *const r,        /* !!! must return a 0 or 1 !!! */
-    vp8_tree t,
+    vp8_tree_p t,
     const vp8_prob *const p
 )
 {

chromium/third_party/libvpx/source/libvpx/vp8/encoder/bitstream.c

@@ -64,7 +64,7 @@ static void update_mode(
     vp8_writer *const w,
     int n,
     vp8_token tok               [/* n */],
-    vp8_tree tree,
+    vp8_tree_p tree,
     vp8_prob Pnew               [/* n-1 */],
     vp8_prob Pcur               [/* n-1 */],
     unsigned int bct            [/* n-1 */] [2],

chromium/third_party/libvpx/source/libvpx/vp8/encoder/treewriter.c

@@ -13,7 +13,7 @@
 
 static void cost(
     int *const C,
-    vp8_tree T,
+    vp8_tree_p T,
     const vp8_prob *const P,
     int i,
     int c
@@ -33,11 +33,11 @@ static void cost(
     }
     while (++i & 1);
 }
-void vp8_cost_tokens(int *c, const vp8_prob *p, vp8_tree t)
+void vp8_cost_tokens(int *c, const vp8_prob *p, vp8_tree_p t)
 {
     cost(c, t, p, 0, 0);
 }
-void vp8_cost_tokens2(int *c, const vp8_prob *p, vp8_tree t,int start)
+void vp8_cost_tokens2(int *c, const vp8_prob *p, vp8_tree_p t,int start)
 {
     cost(c, t, p, start, 0);
 }

chromium/third_party/libvpx/source/libvpx/vp8/encoder/treewriter.h

@@ -60,7 +60,7 @@ static unsigned int vp8_cost_branch(const unsigned int ct[2], vp8_prob p)
 static void vp8_treed_write
 (
     vp8_writer *const w,
-    vp8_tree t,
+    vp8_tree_p t,
     const vp8_prob *const p,
     int v,
     int n               /* number of bits in v, assumed nonzero */
@@ -79,7 +79,7 @@ static void vp8_treed_write
 static void vp8_write_token
 (
     vp8_writer *const w,
-    vp8_tree t,
+    vp8_tree_p t,
     const vp8_prob *const p,
     vp8_token *const x
 )
@@ -88,7 +88,7 @@ static void vp8_write_token
 }
 
 static int vp8_treed_cost(
-    vp8_tree t,
+    vp8_tree_p t,
     const vp8_prob *const p,
     int v,
     int n               /* number of bits in v, assumed nonzero */
@@ -109,7 +109,7 @@ static int vp8_treed_cost(
 }
 static int vp8_cost_token
 (
-    vp8_tree t,
+    vp8_tree_p t,
     const vp8_prob *const p,
     vp8_token *const x
 )
@@ -120,11 +120,11 @@ static int vp8_cost_token
 /* Fill array of costs for all possible token values. */
 
 void vp8_cost_tokens(
-    int *Costs, const vp8_prob *, vp8_tree
+    int *Costs, const vp8_prob *, vp8_tree_p
 );
 
 void vp8_cost_tokens2(
-    int *Costs, const vp8_prob *, vp8_tree, int
+    int *Costs, const vp8_prob *, vp8_tree_p, int
 );
 
 #ifdef __cplusplus

chromium/third_party/libvpx/source/libvpx/vp9/common/vp9_prob.h

@@ -40,7 +40,7 @@ typedef int8_t vp9_tree_index;
    Index > 0 means need another bit, specification at index.
    Nonnegative indices are always even;  processing begins at node 0. */
 
-typedef const vp9_tree_index vp9_tree[];
+typedef const vp9_tree_index vp9_tree[], *vp9_tree_p;;
 
 static INLINE vp9_prob clip_prob(int p) {
   return (p > 255) ? 255 : (p < 1) ? 1 : p;

chromium/third_party/libvpx/source/libvpx/vp9/encoder/vp9_cost.c

@@ -34,7 +34,7 @@ const unsigned int vp9_prob_cost[256] = {
   22,   21,   19,   18,   16,   15,   13,   12,   10,   9,    7,    6,
   4,    3,    1,    1};
 
-static void cost(int *costs, vp9_tree tree, const vp9_prob *probs,
+static void cost(int *costs, vp9_tree_p tree, const vp9_prob *probs,
                  int i, int c) {
   const vp9_prob prob = probs[i / 2];
   int b;
@@ -50,11 +50,11 @@ static void cost(int *costs, vp9_tree tree, const vp9_prob *probs,
   }
 }
 
-void vp9_cost_tokens(int *costs, const vp9_prob *probs, vp9_tree tree) {
+void vp9_cost_tokens(int *costs, const vp9_prob *probs, vp9_tree_p tree) {
   cost(costs, tree, probs, 0, 0);
 }
 
-void vp9_cost_tokens_skip(int *costs, const vp9_prob *probs, vp9_tree tree) {
+void vp9_cost_tokens_skip(int *costs, const vp9_prob *probs, vp9_tree_p tree) {
   assert(tree[0] <= 0 && tree[1] > 0);
 
   costs[-tree[0]] = vp9_cost_bit(probs[0], 0);

chromium/third_party/libvpx/source/libvpx/vp9/encoder/vp9_cost.h

@@ -31,7 +31,7 @@ static INLINE unsigned int cost_branch256(const unsigned int ct[2],
   return ct[0] * vp9_cost_zero(p) + ct[1] * vp9_cost_one(p);
 }
 
-static INLINE int treed_cost(vp9_tree tree, const vp9_prob *probs,
+static INLINE int treed_cost(vp9_tree_p tree, const vp9_prob *probs,
                              int bits, int len) {
   int cost = 0;
   vp9_tree_index i = 0;
@@ -45,8 +45,8 @@ static INLINE int treed_cost(vp9_tree tree, const vp9_prob *probs,
   return cost;
 }
 
-void vp9_cost_tokens(int *costs, const vp9_prob *probs, vp9_tree tree);
-void vp9_cost_tokens_skip(int *costs, const vp9_prob *probs, vp9_tree tree);
+void vp9_cost_tokens(int *costs, const vp9_prob *probs, vp9_tree_p tree);
+void vp9_cost_tokens_skip(int *costs, const vp9_prob *probs, vp9_tree_p tree);
 
 #ifdef __cplusplus
 }  // extern "C"

chromium/third_party/libvpx/source/libvpx/vp9/encoder/vp9_treewriter.c

@@ -31,7 +31,7 @@ void vp9_tokens_from_tree(struct vp9_token *tokens,
   tree2tok(tokens, tree, 0, 0, 0);
 }
 
-static unsigned int convert_distribution(unsigned int i, vp9_tree tree,
+static unsigned int convert_distribution(unsigned int i, vp9_tree_p tree,
                                          unsigned int branch_ct[][2],
                                          const unsigned int num_events[]) {
   unsigned int left, right;
@@ -51,7 +51,7 @@ static unsigned int convert_distribution(unsigned int i, vp9_tree tree,
   return left + right;
 }
 
-void vp9_tree_probs_from_distribution(vp9_tree tree,
+void vp9_tree_probs_from_distribution(vp9_tree_p tree,
                                       unsigned int branch_ct[/* n-1 */][2],
                                       const unsigned int num_events[/* n */]) {
   convert_distribution(0, tree, branch_ct, num_events);

chromium/third_party/libvpx/source/libvpx/vp9/encoder/vp9_treewriter.h

@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-void vp9_tree_probs_from_distribution(vp9_tree tree,
+void vp9_tree_probs_from_distribution(vp9_tree_p tree,
                                       unsigned int branch_ct[ /* n - 1 */ ][2],
                                       const unsigned int num_events[ /* n */ ]);