aboutsummaryrefslogtreecommitdiffstats
path: root/libMpegTPEnc/src
diff options
context:
space:
mode:
authorFraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de>2019-01-03 16:58:03 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-03 16:58:03 -0800
commit4ab4454f2917470e7cc2b4fc0b36c223b3780a5b (patch)
treee9970ed3bbd5a7c21574e50edd994fafee37ffe1 /libMpegTPEnc/src
parent195d913e654401e0b8a20d012b906c3e1f29db59 (diff)
parentbcda185d5694ad9d3f28f919f8b03000510b4d63 (diff)
downloadfdk-aac-4ab4454f2917470e7cc2b4fc0b36c223b3780a5b.tar.gz
fdk-aac-4ab4454f2917470e7cc2b4fc0b36c223b3780a5b.tar.bz2
fdk-aac-4ab4454f2917470e7cc2b4fc0b36c223b3780a5b.zip
Merge "Add AOT specific number of qmf bands sanity check in SpatialSpecificConfig()"
am: bcda185d56 Change-Id: I0717e1ac3818b2516b3a57b929e2d84f4384dbce
Diffstat (limited to 'libMpegTPEnc/src')
-rw-r--r--libMpegTPEnc/src/tpenc_asc.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libMpegTPEnc/src/tpenc_asc.cpp b/libMpegTPEnc/src/tpenc_asc.cpp
index ce4e364..0b484a0 100644
--- a/libMpegTPEnc/src/tpenc_asc.cpp
+++ b/libMpegTPEnc/src/tpenc_asc.cpp
@@ -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, NULL) +
+ 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, NULL);
+ 0, 0, NULL);
}
if (config->downscaleSamplingRate != 0 &&