diff options
| author | Martin Storsjo <martin@martin.st> | 2022-01-10 13:44:04 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2022-01-10 13:55:34 +0200 |
| commit | 41ae84525e66febd33ea1fa0130a5b46610f4173 (patch) | |
| tree | 2e7f66da35feda4d6136c3a9e970ebee254d0c2d /libMpegTPEnc/src | |
| parent | 573e93e4d0d08127dd3b2297a0ce52221527d90a (diff) | |
| parent | dd6d9f9f6c9d095bd159d4f0d8b36a6b7e6057a8 (diff) | |
| download | fdk-aac-41ae84525e66febd33ea1fa0130a5b46610f4173.tar.gz fdk-aac-41ae84525e66febd33ea1fa0130a5b46610f4173.tar.bz2 fdk-aac-41ae84525e66febd33ea1fa0130a5b46610f4173.zip | |
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libMpegTPEnc/src')
| -rw-r--r-- | libMpegTPEnc/src/tpenc_asc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libMpegTPEnc/src/tpenc_asc.cpp b/libMpegTPEnc/src/tpenc_asc.cpp index 0b484a0..9591ba8 100644 --- a/libMpegTPEnc/src/tpenc_asc.cpp +++ b/libMpegTPEnc/src/tpenc_asc.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 - 2020 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -795,7 +795,7 @@ static int transportEnc_writeELDSpecificConfig(HANDLE_FDK_BITSTREAM hBs, const INT eldExtLen = (cb->cbSsc(cb->cbSscData, NULL, config->aot, config->extSamplingRate, 0, - 0, 0, 0, 0, NULL) + + 0, 0, 0, 0, 0, NULL) + 7) >> 3; INT cnt = eldExtLen; @@ -818,7 +818,7 @@ static int transportEnc_writeELDSpecificConfig(HANDLE_FDK_BITSTREAM hBs, } cb->cbSsc(cb->cbSscData, hBs, config->aot, config->extSamplingRate, 0, 0, 0, - 0, 0, NULL); + 0, 0, 0, NULL); } if (config->downscaleSamplingRate != 0 && |