diff options
| author | Glenn Kasten <gkasten@google.com> | 2016-04-20 16:28:31 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2016-04-20 16:28:31 -0700 |
| commit | 28099687b733eac90cff9273b6f8f660176e0784 (patch) | |
| tree | 54f00c5c12777852b7dc3a7999e49e3c4bf5fc78 /libAACenc | |
| parent | be845a7fc28b00793a59c3610c9f6ca8cd2e360e (diff) | |
| parent | ad1e8985d954c289b1c5c0683ac92d5ec08c5e0d (diff) | |
| download | fdk-aac-28099687b733eac90cff9273b6f8f660176e0784.tar.gz fdk-aac-28099687b733eac90cff9273b6f8f660176e0784.tar.bz2 fdk-aac-28099687b733eac90cff9273b6f8f660176e0784.zip | |
resolve merge conflicts of ad1e898 to nyc-dev-plus-aosp
Change-Id: If143807a233d47fb7fd269fd263a8a898109b060
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); } |