From 3036fd761ad484abfc375e2796e0e7b9dd7e1982 Mon Sep 17 00:00:00 2001 From: Scott LaVarnway Date: Tue, 17 May 2016 15:26:12 -0700 Subject: [PATCH] VP9: _get_pred_context_switchable_interp() Remove unnecessary checks. Change-Id: Ic7bce8277ac5f4ae88d4ab7d0ae3ab110b2f225b --- vp9/common/vp9_pred_common.c | 4 ++-- vp9/decoder/vp9_decodemv.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vp9/common/vp9_pred_common.c b/vp9/common/vp9_pred_common.c index b5751fc62..8f90e70e7 100644 --- a/vp9/common/vp9_pred_common.c +++ b/vp9/common/vp9_pred_common.c @@ -28,9 +28,9 @@ int vp9_get_pred_context_switchable_interp(const MACROBLOCKD *xd) { if (left_type == above_type) return left_type; - else if (left_type == SWITCHABLE_FILTERS && above_type != SWITCHABLE_FILTERS) + else if (left_type == SWITCHABLE_FILTERS) return above_type; - else if (left_type != SWITCHABLE_FILTERS && above_type == SWITCHABLE_FILTERS) + else if (above_type == SWITCHABLE_FILTERS) return left_type; else return SWITCHABLE_FILTERS; diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index 8831de9b1..fe89829a9 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -371,9 +371,9 @@ static int dec_get_pred_context_switchable_interp(const MACROBLOCKD *xd) { if (left_type == above_type) return left_type; - else if (left_type == SWITCHABLE_FILTERS && above_type != SWITCHABLE_FILTERS) + else if (left_type == SWITCHABLE_FILTERS) return above_type; - else if (left_type != SWITCHABLE_FILTERS && above_type == SWITCHABLE_FILTERS) + else if (above_type == SWITCHABLE_FILTERS) return left_type; else return SWITCHABLE_FILTERS; -- 2.40.0