summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Marco Nelissen <marcone@google.com> 2015-02-10 23:54:48 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-02-10 23:54:48 +0000
commit6da3cc59a0e77e723a8413d2443b0f1bc5821b03 (patch)
treeaa5eb31a334808d6c422c6def6956eb821bc3311
parentd1e074a72452c909c7ed2a4baf220d9d2f306b20 (diff)
parent396f131de7646faacd74ec3be11c4861bb233872 (diff)
am 396f131d: Merge "Fix memory leak"
* commit '396f131de7646faacd74ec3be11c4861bb233872': Fix memory leak
-rw-r--r--media/jni/soundpool/SoundPool.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp
index a8b91d24c5a9..a73209bf1979 100644
--- a/media/jni/soundpool/SoundPool.cpp
+++ b/media/jni/soundpool/SoundPool.cpp
@@ -484,6 +484,7 @@ static status_t decode(int fd, int64_t offset, int64_t length,
status_t err = AMediaExtractor_setDataSourceFd(ex, fd, offset, length);
if (err != AMEDIA_OK) {
+ AMediaExtractor_delete(ex);
return err;
}