| commit | 9408ce362e6c01656f280696af3aabd190d53356 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Feb 11 00:36:48 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 11 00:36:48 2015 +0000 |
| tree | 266d3e600d2f914c14a801b12500c418d994c382 | |
| parent | a18554e6ca9f6fe06b37dec2ddc29e2f44068619 [diff] | |
| parent | fb14e77f45fbad139a0b0c9278bd003964b8f987 [diff] |
am 6da3cc59: am 396f131d: Merge "Fix memory leak" automerge: fb14e77 * commit 'fb14e77f45fbad139a0b0c9278bd003964b8f987': 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; }