diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2013-11-13 19:35:43 -0500 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2013-11-13 23:18:26 -0500 |
| commit | 2dc27dfa13eb4f2b9cd291852b4e9c9508cd9cb2 (patch) | |
| tree | 2995e3420a13cc416d8c4282f1bfa99aeaad3bf2 /src/opus_multistream_encoder.c | |
| parent | ab86a9cca7f891044d64e4ca6c055bc95224d773 (diff) | |
| download | libopus-2dc27dfa13eb4f2b9cd291852b4e9c9508cd9cb2.tar.gz | |
Rename preemphasis() to celt_preemphasis() to avoid amrnb symbol clash
http://lists.xiph.org/pipermail/opus/2013-November/002372.html
Diffstat (limited to 'src/opus_multistream_encoder.c')
| -rw-r--r-- | src/opus_multistream_encoder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opus_multistream_encoder.c b/src/opus_multistream_encoder.c index 54a0d10e..4430e694 100644 --- a/src/opus_multistream_encoder.c +++ b/src/opus_multistream_encoder.c @@ -256,7 +256,7 @@ void surround_analysis(const CELTMode *celt_mode, const void *pcm, opus_val16 *b { OPUS_COPY(in, mem+c*overlap, overlap); (*copy_channel_in)(x, 1, pcm, channels, c, len); - preemphasis(x, in+overlap, frame_size, 1, upsample, celt_mode->preemph, preemph_mem+c, 0); + celt_preemphasis(x, in+overlap, frame_size, 1, upsample, celt_mode->preemph, preemph_mem+c, 0); clt_mdct_forward(&celt_mode->mdct, in, freq, celt_mode->window, overlap, celt_mode->maxLM-LM, 1); if (upsample != 1) { |