diff options
author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2020-09-15 16:54:16 +0200 |
---|---|---|
committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2020-09-15 16:54:16 +0200 |
commit | 97182034e8829014bdfc0449c2116d629196f1d4 (patch) | |
tree | 6c3f4e3ef63d33aa16c79e530b46382faf0ab406 /libAACdec/src/aacdecoder.cpp | |
parent | bafe5616b88cc52f9f0ded6403a6b3ec68d8c27c (diff) | |
parent | 3a831a5fbc990c83e9b5b804a082bb158364e793 (diff) | |
download | fdk-aac-97182034e8829014bdfc0449c2116d629196f1d4.tar.gz fdk-aac-97182034e8829014bdfc0449c2116d629196f1d4.tar.bz2 fdk-aac-97182034e8829014bdfc0449c2116d629196f1d4.zip |
Merge remote-tracking branch 'mstorjo/master' into dabplus2
Diffstat (limited to 'libAACdec/src/aacdecoder.cpp')
-rw-r--r-- | libAACdec/src/aacdecoder.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libAACdec/src/aacdecoder.cpp b/libAACdec/src/aacdecoder.cpp index 8f03328..7617937 100644 --- a/libAACdec/src/aacdecoder.cpp +++ b/libAACdec/src/aacdecoder.cpp @@ -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 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -1815,6 +1815,9 @@ CAacDecoder_Init(HANDLE_AACDECODER self, const CSAudioSpecificConfig *asc, self->useLdQmfTimeAlign = asc->m_sc.m_eldSpecificConfig.m_useLdQmfTimeAlign; } + if (self->sbrEnabled != asc->m_sbrPresentFlag) { + ascChanged = 1; + } } self->streamInfo.extAot = asc->m_extensionAudioObjectType; |