diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2015-12-31 14:43:49 -0500 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2015-12-31 14:46:14 -0500 |
| commit | 68a0e046a2711e8105a52a43629796f4ef4babd8 (patch) | |
| tree | 6a9814c0fa34007010c52b7eaace04b776818c94 /celt | |
| parent | 9ba205d790cff621d565e554093233b263f7ed0b (diff) | |
| download | libopus-68a0e046a2711e8105a52a43629796f4ef4babd8.tar.gz | |
Renamed MAX_PULSES to SILK_MAX_PULSES and CELT_MAX_PULSES
Avoids accidental name collisions
Diffstat (limited to 'celt')
| -rw-r--r-- | celt/rate.c | 2 | ||||
| -rw-r--r-- | celt/rate.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/celt/rate.c b/celt/rate.c index f85c3ee6..b28d8fec 100644 --- a/celt/rate.c +++ b/celt/rate.c @@ -131,7 +131,7 @@ void compute_pulse_cache(CELTMode *m, int LM) for (i=0;i<nbEntries;i++) { unsigned char *ptr = bits+entryI[i]; - opus_int16 tmp[MAX_PULSES+1]; + opus_int16 tmp[CELT_MAX_PULSES+1]; get_required_bits(tmp, entryN[i], get_pulses(entryK[i]), BITRES); for (j=1;j<=entryK[i];j++) ptr[j] = tmp[get_pulses(j)]-1; diff --git a/celt/rate.h b/celt/rate.h index f1e06611..515f7687 100644 --- a/celt/rate.h +++ b/celt/rate.h @@ -32,7 +32,7 @@ #define MAX_PSEUDO 40 #define LOG_MAX_PSEUDO 6 -#define MAX_PULSES 128 +#define CELT_MAX_PULSES 128 #define MAX_FINE_BITS 8 |