diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2018-12-29 06:31:46 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-29 06:31:46 -0800 |
| commit | 76b3d662bf5e4859502ad678070282f0ecf832f7 (patch) | |
| tree | cad77b2a82907ae316d05433f6c6c39d7a4100a1 | |
| parent | f353517d83fa5ea0c3c181510961b748d0062fef (diff) | |
| parent | a556a32eaebefc94025cf67e211385828881d7d9 (diff) | |
| download | fdk-aac-76b3d662bf5e4859502ad678070282f0ecf832f7.tar.gz fdk-aac-76b3d662bf5e4859502ad678070282f0ecf832f7.tar.bz2 fdk-aac-76b3d662bf5e4859502ad678070282f0ecf832f7.zip | |
Merge "Free whole QMF domain in case of an error in FDK_QmfDomain_Configure()" am: f8881d4bfe am: 005d5690b6
am: a556a32eae
Change-Id: I9969e394bc53319616246788b96c77193f61fa1f
| -rw-r--r-- | libFDK/src/FDK_qmf_domain.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libFDK/src/FDK_qmf_domain.cpp b/libFDK/src/FDK_qmf_domain.cpp index dd63dab..3245deb 100644 --- a/libFDK/src/FDK_qmf_domain.cpp +++ b/libFDK/src/FDK_qmf_domain.cpp @@ -983,9 +983,8 @@ QMF_DOMAIN_ERROR FDK_QmfDomain_Configure(HANDLE_FDK_QMF_DOMAIN hqd) { } bail: - if (err == QMF_DOMAIN_OUT_OF_MEMORY) { - FDK_QmfDomain_FreePersistentMemory(hqd); - FDK_QmfDomain_ClearConfigured(&hqd->globalConf); + if (err) { + FDK_QmfDomain_FreeMem(hqd); } return err; } |