ref: 3fcf0e3668beb051679805a7e8a6425ea0d327aa
parent: 82e8884ad8368e040fab37a79854451ebde51598
parent: f0c01413fb2d8a4db9ba6965ca2ee64edd0a0517
author: John Koleszar <jkoleszar@google.com>
date: Wed Nov 9 04:34:50 EST 2011
Merge "Compiler warning fix for const array."
--- 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 */