diff options
| author | Glenn Kasten <gkasten@google.com> | 2016-04-20 23:40:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-20 23:40:28 +0000 |
| commit | 18a9bb8b6d6bebae0cf3bdb404a2f8c417cd17fc (patch) | |
| tree | 54f00c5c12777852b7dc3a7999e49e3c4bf5fc78 /libAACenc | |
| parent | 268c63c4a5c0152e35a76d1f18a9a80978e7b7c4 (diff) | |
| parent | 28099687b733eac90cff9273b6f8f660176e0784 (diff) | |
| download | fdk-aac-18a9bb8b6d6bebae0cf3bdb404a2f8c417cd17fc.tar.gz fdk-aac-18a9bb8b6d6bebae0cf3bdb404a2f8c417cd17fc.tar.bz2 fdk-aac-18a9bb8b6d6bebae0cf3bdb404a2f8c417cd17fc.zip | |
resolve merge conflicts of ad1e898 to nyc-dev-plus-aosp
am: 2809968
* commit '28099687b733eac90cff9273b6f8f660176e0784':
Remove redundant parentheses around == comparison operator
Change-Id: I87566357ee932ac57eed79645fec146625c85cdb
Diffstat (limited to 'libAACenc')
| -rw-r--r-- | libAACenc/src/aacenc_lib.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libAACenc/src/aacenc_lib.cpp b/libAACenc/src/aacenc_lib.cpp index 2845177..64445b9 100644 --- a/libAACenc/src/aacenc_lib.cpp +++ b/libAACenc/src/aacenc_lib.cpp @@ -1037,7 +1037,7 @@ static AACENC_ERROR aacEncInit(HANDLE_AACENCODER hAacEncoder, } /* Clear input buffer */ - if ( (InitFlags == AACENC_INIT_ALL) ) { + if ( InitFlags == AACENC_INIT_ALL ) { FDKmemclear(hAacEncoder->inputBuffer, sizeof(INT_PCM)*hAacEncoder->nMaxAacChannels*INPUTBUFFER_SIZE); } |