aboutsummaryrefslogtreecommitdiffstats
path: root/libSACdec/src
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2018-12-29 14:10:11 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-12-29 14:10:11 +0000
commitcf4098ed3ba7030b52c129db0dbb9d51b49384e6 (patch)
tree72e4f52ffcfc4e870e34be0e337c3a1bb5f21dba /libSACdec/src
parent6953f2c5b2ad8d7c39e0b7e9327557edca848768 (diff)
parentc371e86ef4d4a6a68e8139e00745faeb8c2c82ba (diff)
downloadfdk-aac-cf4098ed3ba7030b52c129db0dbb9d51b49384e6.tar.gz
fdk-aac-cf4098ed3ba7030b52c129db0dbb9d51b49384e6.tar.bz2
fdk-aac-cf4098ed3ba7030b52c129db0dbb9d51b49384e6.zip
Merge "QMF configuration flag QMF_FLAG_MPSLDFB has always priority over QMF_FLAG_CLDFB"
Diffstat (limited to 'libSACdec/src')
-rw-r--r--libSACdec/src/sac_dec_lib.cpp1
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;