diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2016-04-05 16:14:53 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-05 16:14:53 +0000 |
| commit | bb7ad8711b3b620a7c7de669b7b6409e610c29dd (patch) | |
| tree | 6717743d4422e9d88e9a9f1631effd7563a9856b /libAACenc/src/psy_main.cpp | |
| parent | f86e64f5c712edc2f3dd0a9d59d75a8ebd3422ea (diff) | |
| parent | 0713b4acff1a489e7d49725dc7c5e3dad370b5c8 (diff) | |
| download | fdk-aac-bb7ad8711b3b620a7c7de669b7b6409e610c29dd.tar.gz fdk-aac-bb7ad8711b3b620a7c7de669b7b6409e610c29dd.tar.bz2 fdk-aac-bb7ad8711b3b620a7c7de669b7b6409e610c29dd.zip | |
Remove compiler warnings, revised ARM QMF encoder am: ef30836
am: 0713b4a
* commit '0713b4acff1a489e7d49725dc7c5e3dad370b5c8':
Remove compiler warnings, revised ARM QMF encoder
Change-Id: Ic3e76f0f1f37ff49b46efe5958e19499289db751
Diffstat (limited to 'libAACenc/src/psy_main.cpp')
| -rw-r--r-- | libAACenc/src/psy_main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libAACenc/src/psy_main.cpp b/libAACenc/src/psy_main.cpp index 59193c7..1c593f8 100644 --- a/libAACenc/src/psy_main.cpp +++ b/libAACenc/src/psy_main.cpp @@ -2,7 +2,7 @@ /* ----------------------------------------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. +© Copyright 1995 - 2015 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -447,7 +447,7 @@ AAC_ENCODER_ERROR FDKaacEnc_psyMain(INT channels, INT totalChannels ) { - INT commonWindow = 1; + const INT commonWindow = 1; INT maxSfbPerGroup[(2)]; INT mdctSpectrum_e; INT ch; /* counts through channels */ @@ -815,7 +815,7 @@ AAC_ENCODER_ERROR FDKaacEnc_psyMain(INT channels, &hThisPsyConf[1]->tnsConf); } - FDK_ASSERT(commonWindow=1); /* all checks for TNS do only work for common windows (which is always set)*/ + FDK_ASSERT(1==commonWindow); /* all checks for TNS do only work for common windows (which is always set)*/ for(w = 0; w < nWindows[0]; w++) { if (isShortWindow[0]) |