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/decoder/vp9_decodemv.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/decoder/vp9_decodemv.c')
| -rw-r--r-- | vp9/decoder/vp9_decodemv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index e671f0dba..c7fb71ddf 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -175,8 +175,8 @@ static void read_intra_frame_mode_info(VP9_COMMON *const cm, mbmi->ref_frame[1] = NONE; if (bsize >= BLOCK_8X8) { - const MB_PREDICTION_MODE A = above_block_mode(mi, above_mi, 0); - const MB_PREDICTION_MODE L = left_block_mode(mi, left_mi, 0); + const MB_PREDICTION_MODE A = vp9_above_block_mode(mi, above_mi, 0); + const MB_PREDICTION_MODE L = vp9_left_block_mode(mi, left_mi, 0); mbmi->mode = read_intra_mode(r, vp9_kf_y_mode_prob[A][L]); } else { // Only 4x4, 4x8, 8x4 blocks @@ -187,8 +187,8 @@ static void read_intra_frame_mode_info(VP9_COMMON *const cm, for (idy = 0; idy < 2; idy += num_4x4_h) { for (idx = 0; idx < 2; idx += num_4x4_w) { const int ib = idy * 2 + idx; - const MB_PREDICTION_MODE A = above_block_mode(mi, above_mi, ib); - const MB_PREDICTION_MODE L = left_block_mode(mi, left_mi, ib); + const MB_PREDICTION_MODE A = vp9_above_block_mode(mi, above_mi, ib); + const MB_PREDICTION_MODE L = vp9_left_block_mode(mi, left_mi, ib); const MB_PREDICTION_MODE b_mode = read_intra_mode(r, vp9_kf_y_mode_prob[A][L]); mi->bmi[ib].as_mode = b_mode; |