diff options
| 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 |
| commit | 6da3cc59a0e77e723a8413d2443b0f1bc5821b03 (patch) | |
| tree | aa5eb31a334808d6c422c6def6956eb821bc3311 /media/jni | |
| parent | d1e074a72452c909c7ed2a4baf220d9d2f306b20 (diff) | |
| parent | 396f131de7646faacd74ec3be11c4861bb233872 (diff) | |
| download | frameworks_base-6da3cc59a0e77e723a8413d2443b0f1bc5821b03.zip frameworks_base-6da3cc59a0e77e723a8413d2443b0f1bc5821b03.tar.gz frameworks_base-6da3cc59a0e77e723a8413d2443b0f1bc5821b03.tar.bz2 | |
am 396f131d: Merge "Fix memory leak"
* commit '396f131de7646faacd74ec3be11c4861bb233872':
Fix memory leak
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/soundpool/SoundPool.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp index a8b91d24c..a73209b 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; } |