diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-07-19 01:00:46 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-07-19 01:00:46 -0700 |
| commit | 13253d612127b026e5dd99e76da4e9afe6c7de5d (patch) | |
| tree | 8932c6cdcd7a1aeb65b7ff7d7c4c15d7aca14861 /vp9/decoder | |
| parent | 73ff56b68e328c2368cb3d71a10e10d27016c0f7 (diff) | |
| parent | f9f453ec8d59b69bc57763f3c4bf14527435297e (diff) | |
| download | libvpx-13253d612127b026e5dd99e76da4e9afe6c7de5d.tar libvpx-13253d612127b026e5dd99e76da4e9afe6c7de5d.tar.gz libvpx-13253d612127b026e5dd99e76da4e9afe6c7de5d.tar.bz2 libvpx-13253d612127b026e5dd99e76da4e9afe6c7de5d.zip | |
Merge "Removing kf_{y, uv}_mode_prob arrays from VP9Common."
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 88ede1aae..c6d23f0b9 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -169,7 +169,7 @@ static void read_intra_mode_info(VP9D_COMP *pbi, MODE_INFO *m, const MB_PREDICTION_MODE A = above_block_mode(m, 0, mis); const MB_PREDICTION_MODE L = xd->left_available ? left_block_mode(m, 0) : DC_PRED; - mbmi->mode = read_intra_mode(r, cm->kf_y_mode_prob[A][L]); + mbmi->mode = read_intra_mode(r, vp9_kf_y_mode_prob[A][L]); } else { // Only 4x4, 4x8, 8x4 blocks const int bw = 1 << b_width_log2(bsize); @@ -183,7 +183,7 @@ static void read_intra_mode_info(VP9D_COMP *pbi, MODE_INFO *m, const MB_PREDICTION_MODE L = (xd->left_available || idx) ? left_block_mode(m, ib) : DC_PRED; const MB_PREDICTION_MODE b_mode = read_intra_mode(r, - cm->kf_y_mode_prob[A][L]); + vp9_kf_y_mode_prob[A][L]); m->bmi[ib].as_mode = b_mode; if (bh == 2) m->bmi[ib + 2].as_mode = b_mode; @@ -195,7 +195,7 @@ static void read_intra_mode_info(VP9D_COMP *pbi, MODE_INFO *m, mbmi->mode = m->bmi[3].as_mode; } - mbmi->uv_mode = read_intra_mode(r, cm->kf_uv_mode_prob[mbmi->mode]); + mbmi->uv_mode = read_intra_mode(r, vp9_kf_uv_mode_prob[mbmi->mode]); } static int read_mv_component(vp9_reader *r, |