commit 828119d6ab81f6d3373b0ceebb55ee4495b4973f
author Dmitry Kovalev <dkovalev@google.com> Mon Jul 29 14:35:55 2013 -0700
committer Dmitry Kovalev <dkovalev@google.com> Mon Jul 29 14:35:55 2013 -0700
tree 91c5820a5c0595f35a03b92dac8901c75e74e27e
parent 730a34416f4023647403b7ada03401dbdeced1e6

Renaming txfm to tx for consistency in some places.

Change-Id: I2a6a646570e2af66315e7c658d00d99f80c4b127

vp9/common/vp9_entropy.c

diff --git a/vp9/common/vp9_entropy.c b/vp9/common/vp9_entropy.c
index 9d46a96..cfd59aa 100644
--- a/vp9/common/vp9_entropy.c
+++ b/vp9/common/vp9_entropy.c
@@ -609,16 +609,16 @@
 #define COEF_COUNT_SAT_AFTER_KEY 24
 #define COEF_MAX_UPDATE_FACTOR_AFTER_KEY 128
 
-static void adapt_coef_probs(VP9_COMMON *cm, TX_SIZE txfm_size,
+static void adapt_coef_probs(VP9_COMMON *cm, TX_SIZE tx_size,
                              unsigned int count_sat,
                              unsigned int update_factor) {
   FRAME_CONTEXT *pre_fc = &cm->frame_contexts[cm->frame_context_idx];
 
-  vp9_coeff_probs_model *dst_coef_probs = cm->fc.coef_probs[txfm_size];
-  vp9_coeff_probs_model *pre_coef_probs = pre_fc->coef_probs[txfm_size];
-  vp9_coeff_count_model *coef_counts = cm->counts.coef[txfm_size];
+  vp9_coeff_probs_model *dst_coef_probs = cm->fc.coef_probs[tx_size];
+  vp9_coeff_probs_model *pre_coef_probs = pre_fc->coef_probs[tx_size];
+  vp9_coeff_count_model *coef_counts = cm->counts.coef[tx_size];
   unsigned int (*eob_branch_count)[REF_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS] =
-      cm->counts.eob_branch[txfm_size];
+      cm->counts.eob_branch[tx_size];
   int t, i, j, k, l;
   unsigned int branch_ct[UNCONSTRAINED_NODES][2];
   vp9_prob coef_probs[UNCONSTRAINED_NODES];