From 851a2fd72ce9f29c15d8ddd5c65a49e7cf19a94c Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Tue, 27 Aug 2013 19:47:53 -0700 Subject: Renaming txfm_size to tx_size. Change-Id: I752e374867d459960995b24d197301d65ad535e3 --- vp9/decoder/vp9_decodemv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vp9/decoder') diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index 263e2721c..8dfb22c14 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -160,7 +160,7 @@ static void read_intra_frame_mode_info(VP9D_COMP *pbi, MODE_INFO *m, mbmi->segment_id = read_intra_segment_id(pbi, mi_row, mi_col, r); mbmi->skip_coeff = read_skip_coeff(pbi, mbmi->segment_id, r); - mbmi->txfm_size = read_tx_size(pbi, cm->tx_mode, bsize, 1, r); + mbmi->tx_size = read_tx_size(pbi, cm->tx_mode, bsize, 1, r); mbmi->ref_frame[0] = INTRA_FRAME; mbmi->ref_frame[1] = NONE; @@ -591,8 +591,8 @@ static void read_inter_frame_mode_info(VP9D_COMP *pbi, MODE_INFO *mi, mbmi->segment_id = read_inter_segment_id(pbi, mi_row, mi_col, r); mbmi->skip_coeff = read_skip_coeff(pbi, mbmi->segment_id, r); inter_block = read_is_inter_block(pbi, mbmi->segment_id, r); - mbmi->txfm_size = read_tx_size(pbi, cm->tx_mode, mbmi->sb_type, - !mbmi->skip_coeff || !inter_block, r); + mbmi->tx_size = read_tx_size(pbi, cm->tx_mode, mbmi->sb_type, + !mbmi->skip_coeff || !inter_block, r); if (inter_block) read_inter_block_mode_info(pbi, mi, mi_row, mi_col, r); -- cgit v1.2.3