summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaowu Xu <yaowu@google.com>2016-05-26 21:29:49 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-05-26 21:29:50 +0000
commitff6accf936eb81fac5a96ca1ea3586b4c104486f (patch)
tree3f68cc518a88f1295482ba6b88d9d42a07363426
parent9d24fe60f11ffaab7d0ec5da927786f1b5907707 (diff)
parent301e34527307690e66ac53f37022002c97e3af0d (diff)
downloadlibvpx-ff6accf936eb81fac5a96ca1ea3586b4c104486f.tar
libvpx-ff6accf936eb81fac5a96ca1ea3586b4c104486f.tar.gz
libvpx-ff6accf936eb81fac5a96ca1ea3586b4c104486f.tar.bz2
libvpx-ff6accf936eb81fac5a96ca1ea3586b4c104486f.zip
Merge "Convert to unsigned int before left shift"
-rw-r--r--vpx_ports/mem_ops.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/vpx_ports/mem_ops.h b/vpx_ports/mem_ops.h
index 1f8f914f1..80c034e5f 100644
--- a/vpx_ports/mem_ops.h
+++ b/vpx_ports/mem_ops.h
@@ -89,7 +89,7 @@ static unsigned MEM_VALUE_T mem_get_be32(const void *vmem) {
unsigned MEM_VALUE_T val;
const MAU_T *mem = (const MAU_T *)vmem;
- val = mem[0] << 24;
+ val = ((unsigned int)mem[0]) << 24;
val |= mem[1] << 16;
val |= mem[2] << 8;
val |= mem[3];