diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-10-28 10:07:06 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-10-28 10:07:06 -0700 |
| commit | ded951793c5f13d62b608f4f964a4c5f1f633150 (patch) | |
| tree | 5ada20743119cca4fbe63c70e65d53421c389ae1 | |
| parent | 50c4026e93e0826194ec7e3bd62019a3ff6fe0ef (diff) | |
| parent | 7bb48e5e8e50c8a2cf8a646bac117ff854a0037b (diff) | |
| download | libvpx-ded951793c5f13d62b608f4f964a4c5f1f633150.tar libvpx-ded951793c5f13d62b608f4f964a4c5f1f633150.tar.gz libvpx-ded951793c5f13d62b608f4f964a4c5f1f633150.tar.bz2 libvpx-ded951793c5f13d62b608f4f964a4c5f1f633150.zip | |
Merge "Replacing is_inter_mode with is_inter_block."
| -rw-r--r-- | vp9/common/vp9_pred_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/common/vp9_pred_common.c b/vp9/common/vp9_pred_common.c index be42c56b5..57ca5c5da 100644 --- a/vp9/common/vp9_pred_common.c +++ b/vp9/common/vp9_pred_common.c @@ -35,14 +35,14 @@ unsigned char vp9_get_pred_context_switchable_interp(const MACROBLOCKD *xd) { // left of the entries correpsonding to real macroblocks. // The prediction flags in these dummy entries are initialised to 0. // left - const int left_mv_pred = left_in_image ? is_inter_mode(left_mi->mbmi.mode) + const int left_mv_pred = left_in_image ? is_inter_block(&left_mi->mbmi) : 0; const int left_interp = left_in_image && left_mv_pred ? left_mi->mbmi.interp_filter : SWITCHABLE_FILTERS; // above - const int above_mv_pred = above_in_image ? is_inter_mode(above_mi->mbmi.mode) + const int above_mv_pred = above_in_image ? is_inter_block(&above_mi->mbmi) : 0; const int above_interp = above_in_image && above_mv_pred ? above_mi->mbmi.interp_filter |