diff options
| author | Glenn Kasten <gkasten@google.com> | 2016-04-20 23:59:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-20 23:59:17 +0000 |
| commit | 450151173c60fb9481b9757b6049573cdc04aa08 (patch) | |
| tree | 54f00c5c12777852b7dc3a7999e49e3c4bf5fc78 /libAACenc | |
| parent | 7342ab656882c2355518176bacb92410462780f9 (diff) | |
| parent | 18a9bb8b6d6bebae0cf3bdb404a2f8c417cd17fc (diff) | |
| download | fdk-aac-450151173c60fb9481b9757b6049573cdc04aa08.tar.gz fdk-aac-450151173c60fb9481b9757b6049573cdc04aa08.tar.bz2 fdk-aac-450151173c60fb9481b9757b6049573cdc04aa08.zip | |
resolve merge conflicts of ad1e898 to nyc-dev-plus-aosp am: 2809968
am: 18a9bb8
* commit '18a9bb8b6d6bebae0cf3bdb404a2f8c417cd17fc':
Remove redundant parentheses around == comparison operator
Change-Id: If91ecced946588a7d6f48aab5a90e0e8503793b1
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); } |