From: Jim Bankoski <jimbankoski@google.com>
Date: Tue, 19 Aug 2014 13:40:29 +0000 (-0700)
Subject: vp9_rdopt.c : signed unsigned mismatch in choose_tx_size
X-Git-Tag: v1.4.0~985^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f274ac7df50f7a4c62ce04a6330d74f9899a38a5;p=libvpx

vp9_rdopt.c : signed unsigned mismatch in choose_tx_size

Change-Id: Id68736ffa71843b02ee3634edc525219d6e54d4f
---

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;