diff options
| author | Narayan Kamath <narayan@google.com> | 2014-07-14 10:15:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-10 20:14:56 +0000 |
| commit | b7a88e3101d2d871f1d90c08806577a859f1ea12 (patch) | |
| tree | 892372ef6243fcefd97f82abb31cc3d031d1c9ab /media | |
| parent | 0bffd2e60f644c8b8650c48d320c8cc22deb8ab6 (diff) | |
| parent | a0c5812dfbb34c168129baa300942db18bed9f5e (diff) | |
| download | frameworks_av-b7a88e3101d2d871f1d90c08806577a859f1ea12.zip frameworks_av-b7a88e3101d2d871f1d90c08806577a859f1ea12.tar.gz frameworks_av-b7a88e3101d2d871f1d90c08806577a859f1ea12.tar.bz2 | |
Merge "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 89f0fed..795be88 100644 --- a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp +++ b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp @@ -342,10 +342,10 @@ OMX_ERRORTYPE SoftAVCEncoder::releaseEncoder() { PVAVCCleanUpEncoder(mHandle); releaseOutputBuffers(); - delete mInputFrameData; + free(mInputFrameData); mInputFrameData = NULL; - delete mSliceGroup; + free(mSliceGroup); mSliceGroup = NULL; delete mEncParams; |