commit 47dd0b45892a39c9a8b3822745dddb255c3886c4
author liuchao <liuchao741@huawei.com> Thu Feb 23 21:50:11 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 23 21:50:11 2017 +0000
tree e1e8bc174eb8e3e29646a8d4b5c5ed696d0acb1f
parent 30fa0b87e9b0306cdd59e6c5d3e8ff5cab56d026
parent ef9be616803b6de920f838f1bc12f611bc7e16a2

Merge "Fix not properly handled NULL-pointer access before check in aac lib" am: b0af861f5a am: b0f6b2906e
am: ef9be61680

Change-Id: Ibfe81134a2089946800580538775faaa1bbe00ef

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 {