diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2014-08-19 06:40:29 -0700 |
|---|---|---|
| committer | Jim Bankoski <jimbankoski@google.com> | 2014-08-19 06:40:29 -0700 |
| commit | f274ac7df50f7a4c62ce04a6330d74f9899a38a5 (patch) | |
| tree | eff942e760e17ba1823146e300eac5b3139e1bdc /vp9/encoder/vp9_rdopt.c | |
| parent | b29d517344d2bee03fd061e54ce7376a2a7cf9d3 (diff) | |
| download | libvpx-f274ac7df50f7a4c62ce04a6330d74f9899a38a5.tar libvpx-f274ac7df50f7a4c62ce04a6330d74f9899a38a5.tar.gz libvpx-f274ac7df50f7a4c62ce04a6330d74f9899a38a5.tar.bz2 libvpx-f274ac7df50f7a4c62ce04a6330d74f9899a38a5.zip | |
vp9_rdopt.c : signed unsigned mismatch in choose_tx_size
Change-Id: Id68736ffa71843b02ee3634edc525219d6e54d4f
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index db4b8fdda..cfda964ce 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -507,7 +507,7 @@ static void choose_tx_size_from_rd(VP9_COMP *cpi, MACROBLOCK *x, cpi->sf.use_fast_coef_costing); r[n][1] = r[n][0]; if (r[n][0] < INT_MAX) { - for (m = 0; m <= n - (n == max_tx_size); m++) { + for (m = 0; m <= n - (n == (int) max_tx_size); m++) { if (m == n) r[n][1] += vp9_cost_zero(tx_probs[m]); else @@ -526,7 +526,7 @@ static void choose_tx_size_from_rd(VP9_COMP *cpi, MACROBLOCK *x, // Early termination in transform size search. if (cpi->sf.tx_size_search_breakout && (rd[n][1] == INT64_MAX || - (n < max_tx_size && rd[n][1] > rd[n + 1][1]) || + (n < (int) max_tx_size && rd[n][1] > rd[n + 1][1]) || s[n] == 1)) break; |