commit 0521213468ffe960ab66925c8378c72a5abda263
author Ruben Brunk <rubenbrunk@google.com> Mon Jul 14 23:20:33 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 14 23:20:33 2014 +0000
tree 268cf6205e59285c9af95227f2520976e5899978
parent cf85bbba8abe66cac89369f6b61dab2719eefe19
parent 5698d4461a260dbf208484383f692b03c6473e74

am 5698d446: camera2: Set orientation flags for hardware composer.

* commit '5698d4461a260dbf208484383f692b03c6473e74':
  camera2: Set orientation flags for hardware composer.

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 0f4a00d..e783540 100644
--- a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
+++ b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
@@ -348,10 +348,10 @@
     PVAVCCleanUpEncoder(mHandle);
     releaseOutputBuffers();
 
-    delete mInputFrameData;
+    free(mInputFrameData);
     mInputFrameData = NULL;
 
-    delete mSliceGroup;
+    free(mSliceGroup);
     mSliceGroup = NULL;
 
     delete mEncParams;