diff options
| author | Narayan Kamath <narayan@google.com> | 2014-07-14 18:17:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-14 18:17:45 +0000 |
| commit | 255e7d7183d8ad4171408c476d19e95dad502eb2 (patch) | |
| tree | 5f30bfdb4a32ac349413939b2365c753af285fd1 /media | |
| parent | f6ef963fecde3b63696028fadce4bcfb5b998db0 (diff) | |
| parent | 24a5a7c30ad041971ca511f4c7f784936090dfc6 (diff) | |
| download | frameworks_av-255e7d7183d8ad4171408c476d19e95dad502eb2.zip frameworks_av-255e7d7183d8ad4171408c476d19e95dad502eb2.tar.gz frameworks_av-255e7d7183d8ad4171408c476d19e95dad502eb2.tar.bz2 | |
am 24a5a7c3: am b7a88e31: Merge "h264_enc: Use free() to release memory allocated with malloc()"
* commit '24a5a7c30ad041971ca511f4c7f784936090dfc6':
h264_enc: Use free() to release memory allocated with malloc()
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp index 0f4a00d..e783540 100644 --- a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp +++ b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp @@ -348,10 +348,10 @@ OMX_ERRORTYPE SoftAVCEncoder::releaseEncoder() { PVAVCCleanUpEncoder(mHandle); releaseOutputBuffers(); - delete mInputFrameData; + free(mInputFrameData); mInputFrameData = NULL; - delete mSliceGroup; + free(mSliceGroup); mSliceGroup = NULL; delete mEncParams; |