diff options
| author | Santosh Madhava <smadhava@google.com> | 2011-02-28 09:12:34 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-28 09:12:34 -0800 |
| commit | 15f5eeef0e75ca269711325fbbbe67f5ea4de59f (patch) | |
| tree | 91aeb12cf162b8e5cfcc372ea297f183e04a3207 /media | |
| parent | dd1ddc3b1626f8bc335b6e54a73e8dc18bc71bb5 (diff) | |
| parent | 7c8f25f5b81ed2c6520174ead6d0fdf96a313945 (diff) | |
| download | frameworks_base-15f5eeef0e75ca269711325fbbbe67f5ea4de59f.zip frameworks_base-15f5eeef0e75ca269711325fbbbe67f5ea4de59f.tar.gz frameworks_base-15f5eeef0e75ca269711325fbbbe67f5ea4de59f.tar.bz2 | |
Merge "Fix for issue 3431967: Memory leak from video editor engine"
Diffstat (limited to 'media')
| -rwxr-xr-x | media/jni/mediaeditor/VideoEditorMain.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/media/jni/mediaeditor/VideoEditorMain.cpp b/media/jni/mediaeditor/VideoEditorMain.cpp index 23081f8..9fe0266 100755 --- a/media/jni/mediaeditor/VideoEditorMain.cpp +++ b/media/jni/mediaeditor/VideoEditorMain.cpp @@ -1707,12 +1707,19 @@ videoEditor_populateSettings( if (aFramingCtx->FramingYuv != M4OSA_NULL ) { - if (aFramingCtx->FramingYuv->pac_data != M4OSA_NULL) { - M4OSA_free((M4OSA_MemAddr32)aFramingCtx->FramingYuv->pac_data); - aFramingCtx->FramingYuv->pac_data = M4OSA_NULL; + if (aFramingCtx->FramingYuv[0].pac_data != M4OSA_NULL) { + M4OSA_free((M4OSA_MemAddr32)aFramingCtx->FramingYuv[0].pac_data); + aFramingCtx->FramingYuv[0].pac_data = M4OSA_NULL; } - } - if (aFramingCtx->FramingYuv != M4OSA_NULL) { + if (aFramingCtx->FramingYuv[1].pac_data != M4OSA_NULL) { + M4OSA_free((M4OSA_MemAddr32)aFramingCtx->FramingYuv[1].pac_data); + aFramingCtx->FramingYuv[1].pac_data = M4OSA_NULL; + } + if (aFramingCtx->FramingYuv[2].pac_data != M4OSA_NULL) { + M4OSA_free((M4OSA_MemAddr32)aFramingCtx->FramingYuv[2].pac_data); + aFramingCtx->FramingYuv[2].pac_data = M4OSA_NULL; + } + M4OSA_free((M4OSA_MemAddr32)aFramingCtx->FramingYuv); aFramingCtx->FramingYuv = M4OSA_NULL; } |