diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2018-12-29 06:17:11 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-29 06:17:11 -0800 |
| commit | ca5723b92244e44a343febda95dbac59805c16bb (patch) | |
| tree | 90d810bbbd8d6acc5d88ff369b11f3397af78a48 /libSACdec/src | |
| parent | ecba7fdd999225f21e7c1de6077d36302729c6bb (diff) | |
| parent | 57939192c3378e57d4af8509a086f58e9721a7c1 (diff) | |
| download | fdk-aac-ca5723b92244e44a343febda95dbac59805c16bb.tar.gz fdk-aac-ca5723b92244e44a343febda95dbac59805c16bb.tar.bz2 fdk-aac-ca5723b92244e44a343febda95dbac59805c16bb.zip | |
Merge "QMF configuration flag QMF_FLAG_MPSLDFB has always priority over QMF_FLAG_CLDFB" am: cf4098ed3b
am: 57939192c3
Change-Id: I799ffa0efb296051c963645e5070dfae67ef9b03
Diffstat (limited to 'libSACdec/src')
| -rw-r--r-- | libSACdec/src/sac_dec_lib.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libSACdec/src/sac_dec_lib.cpp b/libSACdec/src/sac_dec_lib.cpp index e881599..7549e51 100644 --- a/libSACdec/src/sac_dec_lib.cpp +++ b/libSACdec/src/sac_dec_lib.cpp @@ -1087,6 +1087,7 @@ mpegSurroundDecoder_ConfigureQmfDomain( if (coreCodec == AOT_ER_AAC_ELD) { pGC->flags_requested |= QMF_FLAG_MPSLDFB; + pGC->flags_requested &= ~QMF_FLAG_CLDFB; } return err; |