summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@google.com>2012-11-17 18:32:33 -0800
committerRonald S. Bultje <rbultje@google.com>2012-11-23 08:15:00 -0800
commit4422847143f77117d222aee2b94f869c5b39870f (patch)
tree62ea82f543e86b493cec3c6ad7a4adc30d4a4edd
parent91d703b2b21f40f27dceb57481a5bb92f5ece1d1 (diff)
downloadlibvpx-4422847143f77117d222aee2b94f869c5b39870f.tar
libvpx-4422847143f77117d222aee2b94f869c5b39870f.tar.gz
libvpx-4422847143f77117d222aee2b94f869c5b39870f.tar.bz2
libvpx-4422847143f77117d222aee2b94f869c5b39870f.zip
Rename "block_type" function argument to "txfm_size".
Also fix the type (TX_SIZE instead of int). Change-Id: Ib9b3f33835e58a6e758ed5f37bb64543e62b6a86
-rw-r--r--vp9/decoder/detokenize.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/decoder/detokenize.c b/vp9/decoder/detokenize.c
index 1194aa82c..30b6d868f 100644
--- a/vp9/decoder/detokenize.c
+++ b/vp9/decoder/detokenize.c
@@ -124,14 +124,14 @@ static int decode_coefs(VP9D_COMP *dx, const MACROBLOCKD *xd,
PLANE_TYPE type,
TX_TYPE tx_type,
int seg_eob, INT16 *qcoeff_ptr,
- const int *const scan, int block_type,
+ const int *const scan, TX_SIZE txfm_size,
const int *coef_bands) {
FRAME_CONTEXT *const fc = &dx->common.fc;
int pt, c = (type == PLANE_TYPE_Y_NO_DC);
vp9_prob (*coef_probs)[PREV_COEF_CONTEXTS][ENTROPY_NODES], *prob;
unsigned int (*coef_counts)[PREV_COEF_CONTEXTS][MAX_ENTROPY_TOKENS];
- switch (block_type) {
+ switch (txfm_size) {
default:
case TX_4X4:
if (tx_type == DCT_DCT) {