diff options
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-03-27 00:50:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-27 00:50:12 +0000 |
| commit | 7616a7e29066d65ecd1d6f54485360d3964c67bb (patch) | |
| tree | c051eed430b02e9a3b5275d65969e25b024e2733 /libvpx/vp9/common/vp9_idct.h | |
| parent | b2e48fbeea3ad651e5e1d00770cb3609c60bb3e7 (diff) | |
| parent | 2ec72e65689c948e92b826ae1e867bf369e72f13 (diff) | |
| download | android_external_libvpx-7616a7e29066d65ecd1d6f54485360d3964c67bb.tar.gz android_external_libvpx-7616a7e29066d65ecd1d6f54485360d3964c67bb.tar.bz2 android_external_libvpx-7616a7e29066d65ecd1d6f54485360d3964c67bb.zip | |
am 2ec72e65: libvpx: Roll latest libvpx
* commit '2ec72e65689c948e92b826ae1e867bf369e72f13':
libvpx: Roll latest libvpx
Diffstat (limited to 'libvpx/vp9/common/vp9_idct.h')
| -rw-r--r-- | libvpx/vp9/common/vp9_idct.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libvpx/vp9/common/vp9_idct.h b/libvpx/vp9/common/vp9_idct.h index 2b3f35f..ceca795 100644 --- a/libvpx/vp9/common/vp9_idct.h +++ b/libvpx/vp9/common/vp9_idct.h @@ -18,6 +18,10 @@ #include "vp9/common/vp9_common.h" #include "vp9/common/vp9_enums.h" +#ifdef __cplusplus +extern "C" { +#endif + // Constants and Macros used by all idct/dct functions #define DCT_CONST_BITS 14 @@ -77,8 +81,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*); @@ -104,4 +107,8 @@ void vp9_iht16x16_add(TX_TYPE tx_type, const int16_t *input, uint8_t *dest, int stride, int eob); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP9_COMMON_VP9_IDCT_H_ |