diff options
| author | Martin Storsjo <martin@martin.st> | 2019-10-08 14:53:07 +0300 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2019-10-08 14:53:07 +0300 |
| commit | e365f4f27802954f0cf65d3e2eac88b7fdebc83c (patch) | |
| tree | d0ef656126c0ad2758164a0cf04136efccfe14c1 /libAACenc/src/aacenc_lib.cpp | |
| parent | d387d3b6ed79ff9a82c60440bdd86e6e5e324bec (diff) | |
| parent | d929f68a05f5cbdd812dca287c8115a39439acf1 (diff) | |
| download | fdk-aac-e365f4f27802954f0cf65d3e2eac88b7fdebc83c.tar.gz fdk-aac-e365f4f27802954f0cf65d3e2eac88b7fdebc83c.tar.bz2 fdk-aac-e365f4f27802954f0cf65d3e2eac88b7fdebc83c.zip | |
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libAACenc/src/aacenc_lib.cpp')
| -rw-r--r-- | libAACenc/src/aacenc_lib.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libAACenc/src/aacenc_lib.cpp b/libAACenc/src/aacenc_lib.cpp index 8df33a4..b10fa84 100644 --- a/libAACenc/src/aacenc_lib.cpp +++ b/libAACenc/src/aacenc_lib.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -1761,6 +1761,10 @@ AACENC_ERROR aacEncEncode(const HANDLE_AACENCODER hAacEncoder, hAacEncoder->inputBuffer + (hAacEncoder->inputBufferOffset + hAacEncoder->nSamplesRead) / hAacEncoder->aacConfig.nChannels; + newSamples -= + (newSamples % + hAacEncoder->extParam + .nChannels); /* process multiple samples of input channels */ /* Copy new input samples to internal buffer */ if (inBufDesc->bufElSizes[idx] == (INT)sizeof(INT_PCM)) { |