diff options
author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2018-10-16 22:57:04 +0300 |
---|---|---|
committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2018-10-16 22:57:04 +0300 |
commit | aebc9046f9902e0c3f44d0d866261294592ea693 (patch) | |
tree | 4dc3be91b7d2700a2de7bfd928f103309aacad38 /celt/rate.h | |
parent | a8e2a2b1a8ab2cb9d9e7d4fe21128ac9e769fe4e (diff) |
Renaming compute_allocation to clt_compute_allocation() to avoid symbol clashes
As suggested in https://github.com/xiph/opus/pull/83
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 515f7687..852b9d6f 100644 --- a/celt/rate.h +++ b/celt/rate.h @@ -95,7 +95,7 @@ static OPUS_INLINE int pulses2bits(const CELTMode *m, int band, int LM, int puls @param pulses Number of pulses per band (returned) @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, +int clt_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, int signalBandwidth); #endif |