commit 24a5a7c30ad041971ca511f4c7f784936090dfc6
author Narayan Kamath <narayan@google.com> Mon Jul 14 10:18:28 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 14 10:18:28 2014 +0000
tree 16fe9c083de9fa99d4b5e2ac08e7104d36384328
parent be44e0e0ffda04725c4864d894a7cc80bd74b5ca
parent b7a88e3101d2d871f1d90c08806577a859f1ea12

am b7a88e31: Merge "h264_enc: Use free() to release memory allocated with malloc()"

* commit 'b7a88e3101d2d871f1d90c08806577a859f1ea12':
  h264_enc: Use free() to release memory allocated with malloc()

media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp

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 @@
     PVAVCCleanUpEncoder(mHandle);
     releaseOutputBuffers();
 
-    delete mInputFrameData;
+    free(mInputFrameData);
     mInputFrameData = NULL;
 
-    delete mSliceGroup;
+    free(mSliceGroup);
     mSliceGroup = NULL;
 
     delete mEncParams;