| Index: source/libvpx/vp9/common/vp9_entropy.c
|
| ===================================================================
|
| --- source/libvpx/vp9/common/vp9_entropy.c (revision 293081)
|
| +++ source/libvpx/vp9/common/vp9_entropy.c (working copy)
|
| @@ -748,10 +748,10 @@
|
| }
|
|
|
| void vp9_default_coef_probs(VP9_COMMON *cm) {
|
| - vp9_copy(cm->fc.coef_probs[TX_4X4], default_coef_probs_4x4);
|
| - vp9_copy(cm->fc.coef_probs[TX_8X8], default_coef_probs_8x8);
|
| - vp9_copy(cm->fc.coef_probs[TX_16X16], default_coef_probs_16x16);
|
| - vp9_copy(cm->fc.coef_probs[TX_32X32], default_coef_probs_32x32);
|
| + vp9_copy(cm->fc->coef_probs[TX_4X4], default_coef_probs_4x4);
|
| + vp9_copy(cm->fc->coef_probs[TX_8X8], default_coef_probs_8x8);
|
| + vp9_copy(cm->fc->coef_probs[TX_16X16], default_coef_probs_16x16);
|
| + vp9_copy(cm->fc->coef_probs[TX_32X32], default_coef_probs_32x32);
|
| }
|
|
|
| #define COEF_COUNT_SAT 24
|
| @@ -765,7 +765,7 @@
|
| unsigned int count_sat,
|
| unsigned int update_factor) {
|
| const FRAME_CONTEXT *pre_fc = &cm->frame_contexts[cm->frame_context_idx];
|
| - vp9_coeff_probs_model *const probs = cm->fc.coef_probs[tx_size];
|
| + vp9_coeff_probs_model *const probs = cm->fc->coef_probs[tx_size];
|
| const vp9_coeff_probs_model *const pre_probs = pre_fc->coef_probs[tx_size];
|
| vp9_coeff_count_model *counts = cm->counts.coef[tx_size];
|
| unsigned int (*eob_counts)[REF_TYPES][COEF_BANDS][COEFF_CONTEXTS] =
|
|
|