Chromium Code Reviews| Index: source/libvpx/vp9/common/vp9_idct.h | 
| =================================================================== | 
| --- source/libvpx/vp9/common/vp9_idct.h (revision 240950) | 
| +++ source/libvpx/vp9/common/vp9_idct.h (working copy) | 
| @@ -77,8 +77,7 @@ | 
| static INLINE int dct_const_round_shift(int input) { | 
| int rv = ROUND_POWER_OF_TWO(input, DCT_CONST_BITS); | 
| - assert(INT16_MIN <= rv && rv <= INT16_MAX); | 
| - return rv; | 
| + return (int16_t)rv; | 
| } | 
| typedef void (*transform_1d)(const int16_t*, int16_t*); |