Merge branch 'master' into nextgenv2

diff --cc vp10/encoder/rdopt.c
Simple merge

diff --cc vp9/encoder/vp9_rdopt.c
Simple merge

diff --cc vpx_dsp/bitreader_buffer.c
index 8c47d5481e264d3d6fcb86677cdb19d5a60405f3,d7b55cf9f410ed962dd71a427c9c2e8e02dbb0f5..595b9bb1233b75fb0598f6d11dac7965358fef2b
--- 1/vpx_dsp/bitreader_buffer.c
--- 2/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
  }