commit 30fa0b87e9b0306cdd59e6c5d3e8ff5cab56d026
author Jakub Pawlowski <jpawlowski@google.com> Tue Feb 21 20:58:55 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 21 20:58:55 2017 +0000
tree 6f72729e0640e5b1f5f7260aa57d9ea9f7be18ef
parent dfc913249657ddb9b10369bcf503d0b151b9afa6
parent f4bd5f6bd44b7896d25e8a00b9f312ec2c6a54b1

Merge "Linux compilation fix" am: b82c85d0b1 am: 7c8dd3bb93
am: f4bd5f6bd4

Change-Id: I4f054be1c1342296c69748c2e616b07c7bd9401c

libAACenc/src/adj_thr.cpp

diff --git a/libAACenc/src/adj_thr.cpp b/libAACenc/src/adj_thr.cpp
index a79a9ae..09584f4 100644
--- a/libAACenc/src/adj_thr.cpp
+++ b/libAACenc/src/adj_thr.cpp
@@ -958,7 +958,7 @@
            CalcInvLdData( (((CalcLdData(frameFormFactor)>>1) -
                             (CalcLdData(frameEnergy)>>(2+1))) -
                            (fMultDiv2(FL2FXCONST_DBL(0.75f),CalcLdData((FIXP_DBL)frameNLines<<(DFRACT_BITS-1-SCALE_NLINES))) -
-                            (((FIXP_DBL)(SCALE_FORM_FAC-SCALE_NRGS_SQRT4+FORM_FAC_SHIFT-(SCALE_NLINES_P34))<<(DFRACT_BITS-1-LD_DATA_SHIFT))>>1))
+                            (((FIXP_DBL)(-((-SCALE_FORM_FAC+SCALE_NRGS_SQRT4-FORM_FAC_SHIFT+SCALE_NLINES_P34) << (DFRACT_BITS-1-LD_DATA_SHIFT))))>>1))
                           )<<1 );
   } else {