| commit | fb14e77f45fbad139a0b0c9278bd003964b8f987 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Feb 11 00:00:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 11 00:00:57 2015 +0000 |
| tree | 5c6dee4fa1f9c087105b3ef07b90425502f0bf32 | |
| parent | efa5b6142082d8c958b09a932fc972261c405912 [diff] | |
| parent | 6da3cc59a0e77e723a8413d2443b0f1bc5821b03 [diff] |
am 6da3cc59: am 396f131d: Merge "Fix memory leak" * commit '6da3cc59a0e77e723a8413d2443b0f1bc5821b03': Fix memory leak
diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp index a8b91d2..a73209b 100644 --- a/media/jni/soundpool/SoundPool.cpp +++ b/media/jni/soundpool/SoundPool.cpp
@@ -484,6 +484,7 @@ status_t err = AMediaExtractor_setDataSourceFd(ex, fd, offset, length); if (err != AMEDIA_OK) { + AMediaExtractor_delete(ex); return err; }