diff options
| author | Jingning Han <jingning@google.com> | 2013-11-20 10:55:27 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-11-20 10:55:27 -0800 |
| commit | 81b9fd4310960854a6e0a66f0376eac901324c80 (patch) | |
| tree | 9ade9c74a5a058e845f1571656bf56eb2a6b7313 /vp9/common | |
| parent | 0ef63f596d2c9cd293bfd08a672b5998af3f93e0 (diff) | |
| parent | bdc4371174e37748a7e64a13defd7b5437be190c (diff) | |
| download | libvpx-81b9fd4310960854a6e0a66f0376eac901324c80.tar libvpx-81b9fd4310960854a6e0a66f0376eac901324c80.tar.gz libvpx-81b9fd4310960854a6e0a66f0376eac901324c80.tar.bz2 libvpx-81b9fd4310960854a6e0a66f0376eac901324c80.zip | |
Merge "Take out assertion from inverse transforms"
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_idct.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vp9/common/vp9_idct.h b/vp9/common/vp9_idct.h index 2b3f35f0a..183c50abf 100644 --- a/vp9/common/vp9_idct.h +++ b/vp9/common/vp9_idct.h @@ -77,8 +77,7 @@ static const int sinpi_4_9 = 15212; 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*); |