diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2018-12-29 06:12:16 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-29 06:12:16 -0800 |
| commit | 57939192c3378e57d4af8509a086f58e9721a7c1 (patch) | |
| tree | 72e4f52ffcfc4e870e34be0e337c3a1bb5f21dba /libSACdec/src | |
| parent | bb3249264438604d874fd33bd19f20abbae67647 (diff) | |
| parent | cf4098ed3ba7030b52c129db0dbb9d51b49384e6 (diff) | |
| download | fdk-aac-57939192c3378e57d4af8509a086f58e9721a7c1.tar.gz fdk-aac-57939192c3378e57d4af8509a086f58e9721a7c1.tar.bz2 fdk-aac-57939192c3378e57d4af8509a086f58e9721a7c1.zip | |
Merge "QMF configuration flag QMF_FLAG_MPSLDFB has always priority over QMF_FLAG_CLDFB"
am: cf4098ed3b
Change-Id: I0166285d3129440c9caa444fe4fcfa9d59c1f6c1
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; |