aboutsummaryrefslogtreecommitdiffstats
path: root/libMpegTPDec
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2018-11-28 18:34:17 -0800
committerBill Yi <byi@google.com>2018-11-28 18:34:17 -0800
commita342c8b68c8bd9d92a4c0f807cbc6230d8b45e5c (patch)
tree66fe1fc4eb2c283bcebf91e53f365c6b22f1b47c /libMpegTPDec
parentf76ceebf7a0ab901ac6586d764ae47576c17e08c (diff)
parentb97c2a93f288df43dd7cc0c45640509a17dddb18 (diff)
downloadfdk-aac-a342c8b68c8bd9d92a4c0f807cbc6230d8b45e5c.tar.gz
fdk-aac-a342c8b68c8bd9d92a4c0f807cbc6230d8b45e5c.tar.bz2
fdk-aac-a342c8b68c8bd9d92a4c0f807cbc6230d8b45e5c.zip
Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
Change-Id: If3ff263d4f628f2c6d4ad3c28d0571284ca1f56d
Diffstat (limited to 'libMpegTPDec')
-rw-r--r--libMpegTPDec/src/tpdec_asc.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/libMpegTPDec/src/tpdec_asc.cpp b/libMpegTPDec/src/tpdec_asc.cpp
index b0f1c6a..8d411e8 100644
--- a/libMpegTPDec/src/tpdec_asc.cpp
+++ b/libMpegTPDec/src/tpdec_asc.cpp
@@ -2102,7 +2102,9 @@ TRANSPORTDEC_ERROR AudioSpecificConfig_Parse(
self->m_aot = getAOT(bs);
self->m_samplingFrequency =
getSampleRate(bs, &self->m_samplingFrequencyIndex, 4);
- if (self->m_samplingFrequency <= 0) {
+ if (self->m_samplingFrequency <= 0 ||
+ (self->m_samplingFrequency > 96000 && self->m_aot != 39) ||
+ self->m_samplingFrequency > 4 * 96000) {
return TRANSPORTDEC_PARSE_ERROR;
}