shithub: libvpx

Download patch

ref: f0c01413fb2d8a4db9ba6965ca2ee64edd0a0517
parent: 44b5f76e3476e27840371539cf68ed04a6f85c6c
author: Fritz Koenig <frkoenig@google.com>
date: Fri Nov 4 11:35:42 EDT 2011 

Compiler warning fix for const array.

Fix compiler warning for passing a non const array
to a function expecting a const array by using an
intermediary pointer and casting.

Change-Id: I9bdd358ebdc926223993fb8fb2098ffedd2f3fc7


--- a/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@ -1214,20 +1214,20 @@
             int k = 0;
             unsigned int prev_coef_count_sum[MAX_ENTROPY_TOKENS] = {0};
             int prev_coef_savings[MAX_ENTROPY_TOKENS] = {0};
+            const unsigned int (*probs)[MAX_ENTROPY_TOKENS];
             /* Calculate new probabilities given the constraint that
              * they must be equal over the prev coef contexts
              */
+
+            probs = (const unsigned int (*)[MAX_ENTROPY_TOKENS])
+                                                    cpi->coef_counts[i][j];
+
+            /* Reset to default probabilities at key frames */
             if (cpi->common.frame_type == KEY_FRAME)
-            {
-                /* Reset to default probabilities at key frames */
-                sum_probs_over_prev_coef_context(default_coef_counts[i][j],
-                                                 prev_coef_count_sum);
-            }
-            else
-            {
-                sum_probs_over_prev_coef_context(cpi->coef_counts[i][j],
-                                                 prev_coef_count_sum);
-            }
+                probs = default_coef_counts[i][j];
+
+            sum_probs_over_prev_coef_context(probs, prev_coef_count_sum);
+
             do
             {
                 /* at every context */