summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2016-07-23 11:41:52 -0700
committerJames Zern <jzern@google.com>2016-07-23 11:41:52 -0700
commit54b2071bf402e34ecc4b29da557f9c6181bf9ab2 (patch)
tree1bf7c7dc490f4093e5a5da2cd69e48b392449557
parentc42d54c3a3a356b41ae83970db86966f5e4526d8 (diff)
downloadlibvpx-54b2071bf402e34ecc4b29da557f9c6181bf9ab2.tar
libvpx-54b2071bf402e34ecc4b29da557f9c6181bf9ab2.tar.gz
libvpx-54b2071bf402e34ecc4b29da557f9c6181bf9ab2.tar.bz2
libvpx-54b2071bf402e34ecc4b29da557f9c6181bf9ab2.zip
vp8/decodeframe: fix signed/unsigned comparison
quiets a visual studio warning Change-Id: Ic7725616bc2cb837e6f79294d4fcff36b67af834
-rw-r--r--vp8/decoder/decodeframe.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/vp8/decoder/decodeframe.c b/vp8/decoder/decodeframe.c
index c76418ef0..0aec2a01b 100644
--- a/vp8/decoder/decodeframe.c
+++ b/vp8/decoder/decodeframe.c
@@ -798,7 +798,8 @@ static void setup_token_decoder(VP8D_COMP *pbi,
if (pbi->decoding_thread_count > num_token_partitions - 1) {
pbi->decoding_thread_count = num_token_partitions - 1;
}
- if (pbi->decoding_thread_count > pbi->common.mb_rows - 1) {
+ if ((int)pbi->decoding_thread_count > pbi->common.mb_rows - 1) {
+ assert(pbi->common.mb_rows > 0);
pbi->decoding_thread_count = pbi->common.mb_rows - 1;
}
#endif