diff options
| author | Santosh Madhava <smadhava@google.com> | 2011-02-11 11:47:18 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-11 11:47:18 -0800 |
| commit | ea3f01bbee32d522fcd843b7f0bd7c680cbd3ad6 (patch) | |
| tree | ccc96d07f992d166de115ef6c5859a61c378df18 /libvideoeditor/lvpp | |
| parent | c32d4c16e4d356d50f72cf687f097ed042bbfb1e (diff) | |
| parent | 5df818550a13d5bd21798badcb413e7a945e15e8 (diff) | |
| download | frameworks_av-ea3f01bbee32d522fcd843b7f0bd7c680cbd3ad6.zip frameworks_av-ea3f01bbee32d522fcd843b7f0bd7c680cbd3ad6.tar.gz frameworks_av-ea3f01bbee32d522fcd843b7f0bd7c680cbd3ad6.tar.bz2 | |
Merge "Fix for issue 3431967 : Memory leak from video editor engine"
Diffstat (limited to 'libvideoeditor/lvpp')
| -rwxr-xr-x | libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp | 4 | ||||
| -rwxr-xr-x | libvideoeditor/lvpp/VideoEditorBGAudioProcessing.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp b/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp index 1ac741c..e699fbe 100755 --- a/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp +++ b/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp @@ -55,6 +55,10 @@ VideoEditorAudioPlayer::~VideoEditorAudioPlayer() { if (mStarted) { reset(); } + if (mAudioProcess != NULL) { + delete mAudioProcess; + mAudioProcess = NULL; + } } status_t VideoEditorAudioPlayer::start(bool sourceAlreadyStarted) { diff --git a/libvideoeditor/lvpp/VideoEditorBGAudioProcessing.h b/libvideoeditor/lvpp/VideoEditorBGAudioProcessing.h index 851a133..8c54e15 100755 --- a/libvideoeditor/lvpp/VideoEditorBGAudioProcessing.h +++ b/libvideoeditor/lvpp/VideoEditorBGAudioProcessing.h @@ -56,7 +56,6 @@ public: void veSetAudioProcessingParams(veAudMixSettings mixParams);
M4OSA_Int32 veProcessAudioMixNDuck(void* , void *, void *);
-protected:
~VideoEditorBGAudioProcessing();
private:
|