diff options
| author | tlegrand@google.com <tlegrand@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-09 08:35:25 +0000 |
|---|---|---|
| committer | tlegrand@google.com <tlegrand@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-09 08:35:25 +0000 |
| commit | 3c3902f0ac13428394f14f78f0fab05ef3468d69 (patch) | |
| tree | ddfc2fe5517c7bf63ef963728a832e8250ba76e7 /celt/entcode.h | |
| parent | dd52457296df1ef41bae8e28dc321d6798509172 (diff) | |
| download | src-3c3902f0ac13428394f14f78f0fab05ef3468d69.tar.gz | |
Updating Opus to release 1.1
opus-1.1.tar.gz downloaded from http://www.opus-codec.org/
R=sergeyu@chromium.org
Review URL: https://codereview.chromium.org/107243004
git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/opus@239448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'celt/entcode.h')
| -rw-r--r-- | celt/entcode.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/celt/entcode.h b/celt/entcode.h index aebecc0..dd13e49 100644 --- a/celt/entcode.h +++ b/celt/entcode.h @@ -26,6 +26,7 @@ */ #include "opus_types.h" +#include "opus_defines.h" #if !defined(_entcode_H) # define _entcode_H (1) @@ -83,15 +84,15 @@ struct ec_ctx{ int error; }; -static inline opus_uint32 ec_range_bytes(ec_ctx *_this){ +static OPUS_INLINE opus_uint32 ec_range_bytes(ec_ctx *_this){ return _this->offs; } -static inline unsigned char *ec_get_buffer(ec_ctx *_this){ +static OPUS_INLINE unsigned char *ec_get_buffer(ec_ctx *_this){ return _this->buf; } -static inline int ec_get_error(ec_ctx *_this){ +static OPUS_INLINE int ec_get_error(ec_ctx *_this){ return _this->error; } @@ -101,7 +102,7 @@ static inline int ec_get_error(ec_ctx *_this){ Return: The number of bits. This will always be slightly larger than the exact value (e.g., all rounding error is in the positive direction).*/ -static inline int ec_tell(ec_ctx *_this){ +static OPUS_INLINE int ec_tell(ec_ctx *_this){ return _this->nbits_total-EC_ILOG(_this->rng); } |