aboutsummaryrefslogtreecommitdiffstats
path: root/libAACenc
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2016-08-23 10:25:28 -0700
committerGlenn Kasten <gkasten@google.com>2016-08-23 10:25:28 -0700
commit2fc642731f78c042c4b67f4cd877619994fe3c65 (patch)
tree691567f560f45767f10249889806edca81dbfd23 /libAACenc
parent2504f6043487ec9c4664efea0229c07c867a53f4 (diff)
downloadfdk-aac-2fc642731f78c042c4b67f4cd877619994fe3c65.tar.gz
fdk-aac-2fc642731f78c042c4b67f4cd877619994fe3c65.tar.bz2
fdk-aac-2fc642731f78c042c4b67f4cd877619994fe3c65.zip
Fix build warning
Bug: 28026175 Change-Id: Ie8d84f694fcb788e5fb8780b11fa07bb98097ce0
Diffstat (limited to 'libAACenc')
-rw-r--r--libAACenc/src/adj_thr.cpp2
1 files changed, 1 insertions, 1 deletions
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 @@ static FIXP_DBL FDKaacEnc_calcChaosMeasure(PSY_OUT_CHANNEL *psyOutChannel,
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 {