From: Yaowu Xu <yaowu@google.com>
Date: Sat, 21 Nov 2015 13:00:05 +0000 (-0800)
Subject: Merge branch 'master' into nextgenv2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c1629ca53b9297c1b7b695204fba76c4ed534485;p=libvpx

Merge branch 'master' into nextgenv2
---

c1629ca53b9297c1b7b695204fba76c4ed534485
diff --cc vpx_dsp/bitreader_buffer.c
index 8c47d5481,d7b55cf9f..595b9bb12
--- a/vpx_dsp/bitreader_buffer.c
+++ b/vpx_dsp/bitreader_buffer.c
@@@ -43,7 -43,11 +43,7 @@@ int vpx_rb_read_signed_literal(struct v
  
  int vpx_rb_read_inv_signed_literal(struct vpx_read_bit_buffer *rb,
                                     int bits) {
 -#if CONFIG_MISC_FIXES
    const int nbits = sizeof(unsigned) * 8 - bits - 1;
-   const unsigned value = vpx_rb_read_literal(rb, bits + 1) << nbits;
+   const unsigned value = (unsigned)vpx_rb_read_literal(rb, bits + 1) << nbits;
    return ((int) value) >> nbits;
 -#else
 -  return vpx_rb_read_signed_literal(rb, bits);
 -#endif
  }