Commit 3fcf0e36 authored by John Koleszar's avatar John Koleszar Committed by Gerrit Code Review

Merge "Compiler warning fix for const array."

parents 82e8884a f0c01413
......@@ -1214,20 +1214,20 @@ static int independent_coef_context_savings(VP8_COMP *cpi)
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 */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment