ref: ded951793c5f13d62b608f4f964a4c5f1f633150
parent: 50c4026e93e0826194ec7e3bd62019a3ff6fe0ef
parent: 7bb48e5e8e50c8a2cf8a646bac117ff854a0037b
author: Dmitry Kovalev <dkovalev@google.com>
date: Mon Oct 28 06:07:06 EDT 2013
Merge "Replacing is_inter_mode with is_inter_block."
--- a/vp9/common/vp9_pred_common.c
+++ b/vp9/common/vp9_pred_common.c
@@ -35,7 +35,7 @@
// 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
@@ -42,7 +42,7 @@
: 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