diff options
| author | Basavapatna Dattaguru <dattaguru@google.com> | 2011-02-17 15:08:17 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-17 15:08:17 -0800 |
| commit | f84f29a3b43d903989f10288bfd3934d446228b3 (patch) | |
| tree | b1a0fe7891589c2935a0954e04603347dbaad7b3 | |
| parent | ac9dde5945fd00a6fb882bd171ee8a42a091fb86 (diff) | |
| parent | b6c571382ade0561e95e63fef484f53971dc8c60 (diff) | |
| download | frameworks_av-f84f29a3b43d903989f10288bfd3934d446228b3.zip frameworks_av-f84f29a3b43d903989f10288bfd3934d446228b3.tar.gz frameworks_av-f84f29a3b43d903989f10288bfd3934d446228b3.tar.bz2 | |
Merge "VideoEditor: Issue ID:3431967 : MemLeak with Invalid input"
| -rwxr-xr-x | libvideoeditor/vss/mcs/src/M4MCS_API.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvideoeditor/vss/mcs/src/M4MCS_API.c b/libvideoeditor/vss/mcs/src/M4MCS_API.c index aaaed14..a327426 100755 --- a/libvideoeditor/vss/mcs/src/M4MCS_API.c +++ b/libvideoeditor/vss/mcs/src/M4MCS_API.c @@ -3237,12 +3237,6 @@ M4OSA_ERR M4MCS_close( M4MCS_Context pContext ) M4OSA_free((M4OSA_MemAddr32)pC->H264MCSTempBuffer); } - if( M4OSA_NULL != pC->m_pInstance ) - { - err = H264MCS_Freeinstance(pC->m_pInstance); - pC->m_pInstance = M4OSA_NULL; - } - M4OSA_TRACE3_0("M4MCS_close(): returning M4NO_ERROR"); return err; } @@ -3307,6 +3301,12 @@ M4OSA_ERR M4MCS_cleanUp( M4MCS_Context pContext ) return M4ERR_STATE; } + if( M4OSA_NULL != pC->m_pInstance ) + { + err = H264MCS_Freeinstance(pC->m_pInstance); + pC->m_pInstance = M4OSA_NULL; + } + /* ----- Free video encoder stuff, if needed ----- */ if( ( M4OSA_NULL != pC->pViEncCtxt) |