diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2018-12-29 06:16:44 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-29 06:16:44 -0800 |
| commit | 005d5690b6fe8fd0d0f624c34ddf9b578815525d (patch) | |
| tree | 4ed455eb7bb969fe1cc2975701bcc8bb05d9bebb | |
| parent | 57939192c3378e57d4af8509a086f58e9721a7c1 (diff) | |
| parent | f8881d4bfeb0027c6da646a85f4235e3044da028 (diff) | |
| download | fdk-aac-005d5690b6fe8fd0d0f624c34ddf9b578815525d.tar.gz fdk-aac-005d5690b6fe8fd0d0f624c34ddf9b578815525d.tar.bz2 fdk-aac-005d5690b6fe8fd0d0f624c34ddf9b578815525d.zip | |
Merge "Free whole QMF domain in case of an error in FDK_QmfDomain_Configure()"
am: f8881d4bfe
Change-Id: Ic1665375b62c5fc64a302395b88a25bd024e17fc
| -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; } |