diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-11-27 16:58:07 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-11-27 16:58:07 +0000 |
| commit | 3ff27560eb001d23e76aaae0f24f80e598fa2c8e (patch) | |
| tree | f727676b8060d3a1966c0e8e37855aaee8b4e216 /celt/rate.h | |
| parent | 0d1f79f4f8b34aa22184b28cb6f5b63cbca0e5c4 (diff) | |
| parent | dd52457296df1ef41bae8e28dc321d6798509172 (diff) | |
| download | src-3ff27560eb001d23e76aaae0f24f80e598fa2c8e.tar.gz | |
Merge third_party/opus/src from https://chromium.googlesource.com/chromium/deps/opus.git at dd52457296df1ef41bae8e28dc321d6798509172
This commit was generated by merge_from_chromium.py.
Change-Id: I3e46f087214a185058a75147e2060a93b087e297
Diffstat (limited to 'celt/rate.h')
| -rw-r--r-- | celt/rate.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/celt/rate.h b/celt/rate.h index e0d5022..263fde9 100644 --- a/celt/rate.h +++ b/celt/rate.h @@ -96,6 +96,6 @@ static inline int pulses2bits(const CELTMode *m, int band, int LM, int pulses) @return Total number of bits allocated */ int compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim, int *intensity, int *dual_stero, - opus_int32 total, opus_int32 *balance, int *pulses, int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec, int encode, int prev); + opus_int32 total, opus_int32 *balance, int *pulses, int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec, int encode, int prev, int signalBandwidth); #endif |