diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-12-13 05:45:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-12-13 05:45:20 +0000 |
| commit | c75797cfaa5199247c53cf40dcc3329e6cdf3cce (patch) | |
| tree | 35b2bf867a84f3a12f791c43de60e55c7e77bfb4 /libMpegTPDec | |
| parent | cdaf85d874abe9b772b2a3bbef7fadee9199bdc3 (diff) | |
| parent | 20c336953febeabbf6deeb38f479ec7642b5a69b (diff) | |
| download | fdk-aac-c75797cfaa5199247c53cf40dcc3329e6cdf3cce.tar.gz fdk-aac-c75797cfaa5199247c53cf40dcc3329e6cdf3cce.tar.bz2 fdk-aac-c75797cfaa5199247c53cf40dcc3329e6cdf3cce.zip | |
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"
Diffstat (limited to 'libMpegTPDec')
| -rw-r--r-- | libMpegTPDec/src/tpdec_asc.cpp | 4 |
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; } |