summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2014-08-01 14:45:12 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-08-01 14:45:12 -0700
commit1b6ac28a2fc3ba9a0bb69b2549d4efb4577e6567 (patch)
tree3b8a689cde5618f9f2c409d3aa3ca50937a04adc
parent5f8fa1325832bca65d8f940c957e27f12b4fdef4 (diff)
parent512f9b631f5431a1be14e2a2966397cebd6f32df (diff)
downloadlibvpx-1b6ac28a2fc3ba9a0bb69b2549d4efb4577e6567.tar
libvpx-1b6ac28a2fc3ba9a0bb69b2549d4efb4577e6567.tar.gz
libvpx-1b6ac28a2fc3ba9a0bb69b2549d4efb4577e6567.tar.bz2
libvpx-1b6ac28a2fc3ba9a0bb69b2549d4efb4577e6567.zip
Merge "removed sign mismatch warning"
-rw-r--r--vp9/common/vp9_common.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/common/vp9_common.h b/vp9/common/vp9_common.h
index 04db7c0bb..2788e66f4 100644
--- a/vp9/common/vp9_common.h
+++ b/vp9/common/vp9_common.h
@@ -49,7 +49,7 @@ extern "C" {
#define vp9_zero_array(dest, n) vpx_memset(dest, 0, n * sizeof(*dest))
static INLINE uint8_t clip_pixel(int val) {
- return (val > 255) ? 255u : (val < 0) ? 0u : val;
+ return (val > 255) ? 255 : (val < 0) ? 0 : val;
}
static INLINE int clamp(int value, int low, int high) {