diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-08-29 12:30:18 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-08-29 12:30:18 -0700 |
| commit | e80bf802a923ef96aa4315c63e2a8a65f5f1586c (patch) | |
| tree | 42a0eceab35d81a5dd5715e10cb8502f7cb506e3 /vp9/decoder | |
| parent | b71807082c10f44c5b80b7c81eaa90a93bd500e3 (diff) | |
| parent | 851a2fd72ce9f29c15d8ddd5c65a49e7cf19a94c (diff) | |
| download | libvpx-e80bf802a923ef96aa4315c63e2a8a65f5f1586c.tar libvpx-e80bf802a923ef96aa4315c63e2a8a65f5f1586c.tar.gz libvpx-e80bf802a923ef96aa4315c63e2a8a65f5f1586c.tar.bz2 libvpx-e80bf802a923ef96aa4315c63e2a8a65f5f1586c.zip | |
Merge "Renaming txfm_size to tx_size."
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodemv.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |