cast enums to int to avoid gcc warning in pred_common

Change-Id: Ie3e478ef4fa565225d9e19a14d2f40aad966c2b6
This commit is contained in:
Jim Bankoski 2014-08-01 07:05:15 -07:00 committed by Gerrit Code Review
parent 63c1c3ee64
commit 128827d947

View File

@ -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;