diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2014-08-01 07:05:15 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-08-04 12:07:37 -0700 |
| commit | 128827d94707df2781ae436d004cdd1d216aa8e4 (patch) | |
| tree | fdff2f392f9b24be5cc6a09d5c86b70da4cab8e0 | |
| parent | 63c1c3ee640bbfa0c46ff1e07a6ee551d440d98d (diff) | |
| download | libvpx-128827d94707df2781ae436d004cdd1d216aa8e4.tar libvpx-128827d94707df2781ae436d004cdd1d216aa8e4.tar.gz libvpx-128827d94707df2781ae436d004cdd1d216aa8e4.tar.bz2 libvpx-128827d94707df2781ae436d004cdd1d216aa8e4.zip | |
cast enums to int to avoid gcc warning in pred_common
Change-Id: Ie3e478ef4fa565225d9e19a14d2f40aad966c2b6
| -rw-r--r-- | vp9/common/vp9_pred_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/common/vp9_pred_common.c b/vp9/common/vp9_pred_common.c index bc9d6ef5e..cdf5fb916 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; |