shithub: libvpx

Download patch

ref: 83eff950adde46235bf973474f746afbf9457989
parent: 0cb31c727084ed32922f92f6d14717ae002d492e
parent: f274ac7df50f7a4c62ce04a6330d74f9899a38a5
author: Jim Bankoski <[email protected]>
date: Tue Aug 19 05:59:10 EDT 2014 

Merge "vp9_rdopt.c : signed unsigned mismatch in choose_tx_size"


--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -507,7 +507,7 @@
                      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 @@
     // 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;