summaryrefslogtreecommitdiff
path: root/vp9/common
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2014-08-01 16:28:38 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-08-01 16:28:38 -0700
commit3a924f6ed1c997e41c1f500151d58542ec91f277 (patch)
treeb43a055293b3b63871d5a3a69bf0668bb29b6330 /vp9/common
parent1b6ac28a2fc3ba9a0bb69b2549d4efb4577e6567 (diff)
parent0f3689d32db27d1ac8d3cd075e116e3f4e099f17 (diff)
downloadlibvpx-3a924f6ed1c997e41c1f500151d58542ec91f277.tar
libvpx-3a924f6ed1c997e41c1f500151d58542ec91f277.tar.gz
libvpx-3a924f6ed1c997e41c1f500151d58542ec91f277.tar.bz2
libvpx-3a924f6ed1c997e41c1f500151d58542ec91f277.zip
Merge "signed unsigned mismatch - warning error"
Diffstat (limited to 'vp9/common')
-rw-r--r--vp9/common/vp9_prob.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/common/vp9_prob.h b/vp9/common/vp9_prob.h
index 3920619d8..fa0e36da4 100644
--- a/vp9/common/vp9_prob.h
+++ b/vp9/common/vp9_prob.h
@@ -44,7 +44,7 @@ typedef int8_t vp9_tree_index;
typedef const vp9_tree_index vp9_tree[];
static INLINE vp9_prob clip_prob(int p) {
- return (p > 255) ? 255u : (p < 1) ? 1u : p;
+ return (p > 255) ? 255 : (p < 1) ? 1 : p;
}
static INLINE vp9_prob get_prob(int num, int den) {