diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-05-03 22:32:38 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-05-03 22:32:38 -0300 |
| commit | dd69aeceac3d1798d0869d8adfb44af883b5fb93 (patch) | |
| tree | 717e9b909ada0661940f6f3d2bd5349c6424bbf1 /drivers/opus/celt/quant_bands.c | |
| parent | 567cb691ec49844101247bb9dc34bc2722f6af4f (diff) | |
| parent | b81d9e6d614a67fd58e2256e90055589205bfa30 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'drivers/opus/celt/quant_bands.c')
| -rw-r--r-- | drivers/opus/celt/quant_bands.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/opus/celt/quant_bands.c b/drivers/opus/celt/quant_bands.c index e64ed28f22..b38bfa8b8e 100644 --- a/drivers/opus/celt/quant_bands.c +++ b/drivers/opus/celt/quant_bands.c @@ -25,10 +25,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#ifdef OPUS_ENABLED #include "opus/opus_config.h" -#endif #include "opus/celt/quant_bands.h" #include "opus/celt/laplace.h" @@ -292,7 +289,7 @@ void quant_coarse_energy(const CELTMode *m, int start, int end, int effEnd, #endif } if (lfe) - max_decay=3; + max_decay = QCONST16(3.f,DB_SHIFT); enc_start_state = *enc; ALLOC(oldEBands_intra, C*m->nbEBands, opus_val16); |