Merge "Removed is_inter_mode() check" into experimental

be7d4f96 · Scott LaVarnway · Gerrit Code Review · 3041cf8c · 37c3144e · be7d4f96
Commit be7d4f96 authored May 03, 2013 by Scott LaVarnway Committed by Gerrit Code Review May 03, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

vp9/decoder/vp9_decodemv.c vp9/decoder/vp9_decodemv.c +3 -5

No files found.
--- a/vp9/decoder/vp9_decodemv.c
+++ b/vp9/decoder/vp9_decodemv.c
@@ -703,11 +703,9 @@ static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
 #endif
    }

-    if (is_inter_mode(mbmi->mode)) {
-      mbmi->interp_filter = cm->mcomp_filter_type == SWITCHABLE
-                                ? read_switchable_filter_type(pbi, r)
-                                : cm->mcomp_filter_type;
-    }
+    mbmi->interp_filter = cm->mcomp_filter_type == SWITCHABLE
+                              ? read_switchable_filter_type(pbi, r)
+                              : cm->mcomp_filter_type;

    if (cm->comp_pred_mode == COMP_PREDICTION_ONLY ||
        (cm->comp_pred_mode == HYBRID_PREDICTION &&