diff options
| author | Alex Converse <aconverse@google.com> | 2015-11-20 17:42:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-11-20 17:42:05 +0000 |
| commit | 612e3c8a0e2c48b72c3da919533392eac85dc997 (patch) | |
| tree | 434821d443d265fcb72702df971dd585cc1c5f5c /vpx_dsp | |
| parent | d37c78819a02ee79eb129cd85e681080c2350e8c (diff) | |
| parent | 42b7c44b2fa40ff8b070809e79f9931526f5fe52 (diff) | |
| download | libvpx-612e3c8a0e2c48b72c3da919533392eac85dc997.tar libvpx-612e3c8a0e2c48b72c3da919533392eac85dc997.tar.gz libvpx-612e3c8a0e2c48b72c3da919533392eac85dc997.tar.bz2 libvpx-612e3c8a0e2c48b72c3da919533392eac85dc997.zip | |
Merge "Fix a signed shift overflow in vpx_rb_read_inv_signed_literal."
Diffstat (limited to 'vpx_dsp')
| -rw-r--r-- | vpx_dsp/bitreader_buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vpx_dsp/bitreader_buffer.c b/vpx_dsp/bitreader_buffer.c index bb917263e..d7b55cf9f 100644 --- a/vpx_dsp/bitreader_buffer.c +++ b/vpx_dsp/bitreader_buffer.c @@ -45,7 +45,7 @@ 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); |