summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Kovalev <dkovalev@google.com>2014-07-01 10:30:39 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-07-01 10:30:39 -0700
commit19cbf5414394d0a45f06e25556433c0b6976aaca (patch)
tree3a7af8ab33c57b9ae4a8e7398b9a7e3de7f54d24
parent14e3caca9a3dc1d263519ad874ee0fcc36e796df (diff)
parent9ba1d60bd1b0ff097b7fc88958be7ba7b589e7ca (diff)
downloadlibvpx-19cbf5414394d0a45f06e25556433c0b6976aaca.tar
libvpx-19cbf5414394d0a45f06e25556433c0b6976aaca.tar.gz
libvpx-19cbf5414394d0a45f06e25556433c0b6976aaca.tar.bz2
libvpx-19cbf5414394d0a45f06e25556433c0b6976aaca.zip
Merge "Fix visual studio build issue"
-rw-r--r--vp9/encoder/vp9_encodeframe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 80a9351fc..94143d92f 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -1172,7 +1172,7 @@ static void set_source_var_based_partition(VP9_COMP *cpi,
const int offset = (mi_row >> 1) * cm->mb_cols + (mi_col >> 1);
int is_larger_better = 0;
int use32x32 = 0;
- int thr = cpi->source_var_thresh;
+ unsigned int thr = cpi->source_var_thresh;
vpx_memset(d32, 0, 4 * sizeof(diff));