aboutsummaryrefslogtreecommitdiffstats
path: root/libMpegTPEnc/include
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-08-14 06:31:12 +0000
committerXin Li <delphij@google.com>2021-08-14 06:31:12 +0000
commita950cd990528f07b93cc5af48145e7cb6bfeb3ca (patch)
treec6a1ddee22e29d9ea00ec2523071a711368189cd /libMpegTPEnc/include
parent6d10f91a77002b6371ebada491f507ef974ca572 (diff)
parentdcb2d8bd81e4f71007abed9bc89d67580a56b93a (diff)
downloadfdk-aac-a950cd990528f07b93cc5af48145e7cb6bfeb3ca.tar.gz
fdk-aac-a950cd990528f07b93cc5af48145e7cb6bfeb3ca.tar.bz2
fdk-aac-a950cd990528f07b93cc5af48145e7cb6bfeb3ca.zip
Merge sc-dev-plus-aosp-without-vendor@7634622
Merged-In: I18d2a0819145e1f02c8868674eab081ab243f0a9 Change-Id: Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947
Diffstat (limited to 'libMpegTPEnc/include')
-rw-r--r--libMpegTPEnc/include/tp_data.h4
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);