diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-28 18:41:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-12-28 18:41:27 +0000 |
| commit | 31608d9a1fba0ae9ce9245d468fc432e993f7125 (patch) | |
| tree | 928c023668de85b15a8ce58e93000398e67a3c49 /libMpegTPEnc/include | |
| parent | e1f4578a40f070fe5bb47eed28854436884b1d7e (diff) | |
| parent | 5eb9ed1b1fe94e8bf94bba4aa305b61db19b48c5 (diff) | |
| download | fdk-aac-31608d9a1fba0ae9ce9245d468fc432e993f7125.tar.gz fdk-aac-31608d9a1fba0ae9ce9245d468fc432e993f7125.tar.bz2 fdk-aac-31608d9a1fba0ae9ce9245d468fc432e993f7125.zip | |
Merge changes Ib8b6973e,I19874768
* changes:
Check number of core channels and SAC decoder input channels to avoid a channel mismatch.
Revise bypass mode in SpatialDecApplyParameterSets() to prevent an assert in fDivNorm().
Diffstat (limited to 'libMpegTPEnc/include')
| -rw-r--r-- | libMpegTPEnc/include/tp_data.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libMpegTPEnc/include/tp_data.h b/libMpegTPEnc/include/tp_data.h index 00de356..464c485 100644 --- a/libMpegTPEnc/include/tp_data.h +++ b/libMpegTPEnc/include/tp_data.h @@ -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 @@ -368,7 +368,7 @@ typedef INT (*cbCtrlCFGChange_t)(void *, const CCtrlCFGChange *); typedef INT (*cbSsc_t)(void *, HANDLE_FDK_BITSTREAM, const AUDIO_OBJECT_TYPE coreCodec, const INT samplingRate, const INT frameSize, - const INT stereoConfigIndex, + const INT numChannels, const INT stereoConfigIndex, const INT coreSbrFrameLengthIndex, const INT configBytes, const UCHAR configMode, UCHAR *configChanged); |