diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2014-01-31 20:16:37 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-31 20:16:37 -0800 |
| commit | 37e5325b9f985e7ce1cd8a128b9bebafded60f40 (patch) | |
| tree | 52275a5e3bc136b053935bb20f581b16d85f3b00 /vp9/encoder/vp9_bitstream.c | |
| parent | 1c3fc437717a790e2f97be5b5484b8914336af6e (diff) | |
| parent | 9dec7712abd23f8523f1f9c6e1d5c5c8b0844126 (diff) | |
| download | libvpx-37e5325b9f985e7ce1cd8a128b9bebafded60f40.tar libvpx-37e5325b9f985e7ce1cd8a128b9bebafded60f40.tar.gz libvpx-37e5325b9f985e7ce1cd8a128b9bebafded60f40.tar.bz2 libvpx-37e5325b9f985e7ce1cd8a128b9bebafded60f40.zip | |
Merge "static function convert to inline or global vp9_blockd.h"
Diffstat (limited to 'vp9/encoder/vp9_bitstream.c')
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index ede744e7f..dc64a107c 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -393,8 +393,8 @@ static void write_mb_modes_kf(const VP9_COMP *cpi, MODE_INFO **mi_8x8, write_selected_tx_size(cpi, m, m->mbmi.tx_size, m->mbmi.sb_type, bc); if (m->mbmi.sb_type >= BLOCK_8X8) { - const MB_PREDICTION_MODE A = above_block_mode(m, above_mi, 0); - const MB_PREDICTION_MODE L = left_block_mode(m, left_mi, 0); + const MB_PREDICTION_MODE A = vp9_above_block_mode(m, above_mi, 0); + const MB_PREDICTION_MODE L = vp9_left_block_mode(m, left_mi, 0); write_intra_mode(bc, ym, vp9_kf_y_mode_prob[A][L]); } else { int idx, idy; @@ -403,8 +403,8 @@ static void write_mb_modes_kf(const VP9_COMP *cpi, MODE_INFO **mi_8x8, for (idy = 0; idy < 2; idy += num_4x4_blocks_high) { for (idx = 0; idx < 2; idx += num_4x4_blocks_wide) { int i = idy * 2 + idx; - const MB_PREDICTION_MODE A = above_block_mode(m, above_mi, i); - const MB_PREDICTION_MODE L = left_block_mode(m, left_mi, i); + const MB_PREDICTION_MODE A = vp9_above_block_mode(m, above_mi, i); + const MB_PREDICTION_MODE L = vp9_left_block_mode(m, left_mi, i); const int bm = m->bmi[i].as_mode; write_intra_mode(bc, bm, vp9_kf_y_mode_prob[A][L]); } |