From 128827d94707df2781ae436d004cdd1d216aa8e4 Mon Sep 17 00:00:00 2001 From: Jim Bankoski Date: Fri, 1 Aug 2014 07:05:15 -0700 Subject: [PATCH] cast enums to int to avoid gcc warning in pred_common Change-Id: Ie3e478ef4fa565225d9e19a14d2f40aad966c2b6 --- vp9/common/vp9_pred_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vp9/common/vp9_pred_common.c b/vp9/common/vp9_pred_common.c index bc9d6ef..cdf5fb9 100644 --- a/vp9/common/vp9_pred_common.c +++ b/vp9/common/vp9_pred_common.c @@ -353,9 +353,9 @@ int vp9_get_tx_size_context(const MACROBLOCKD *xd) { const MB_MODE_INFO *const left_mbmi = get_mbmi(get_left_mi(xd)); const int has_above = above_mbmi != NULL; const int has_left = left_mbmi != NULL; - int above_ctx = (has_above && !above_mbmi->skip) ? above_mbmi->tx_size + int above_ctx = (has_above && !above_mbmi->skip) ? (int)above_mbmi->tx_size : max_tx_size; - int left_ctx = (has_left && !left_mbmi->skip) ? left_mbmi->tx_size + int left_ctx = (has_left && !left_mbmi->skip) ? (int)left_mbmi->tx_size : max_tx_size; if (!has_left) left_ctx = above_ctx; -- 2.7.4