commit e493afff2c5173fe934c1afaa9254938a7fa7590
author Glenn Kasten <gkasten@google.com> Thu Jul 17 14:02:30 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 17 14:02:30 2014 +0000
tree 5616f0486d430470fac41e7d61fb0f296a649766
parent 2399ae9d9c215cdd1744aaa21ce9b821f103296a
parent d81d48961da30f657fb095ed00a697bd50266269

am d81d4896: Merge "Add audio_input_flags_t to HAL open_input_stream" into lmp-dev

* commit 'd81d48961da30f657fb095ed00a697bd50266269':
  Add audio_input_flags_t to HAL open_input_stream

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;

media/libstagefright/httplive/M3UParser.cpp

diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp
index 4f7668c..efd852c 100644
--- a/media/libstagefright/httplive/M3UParser.cpp
+++ b/media/libstagefright/httplive/M3UParser.cpp
@@ -730,6 +730,9 @@
 
             key.tolower();
             const AString &codecs = unquoteString(val);
+            if (meta->get() == NULL) {
+                *meta = new AMessage;
+            }
             (*meta)->setString(key.c_str(), codecs.c_str());
         } else if (!strcasecmp("audio", key.c_str())
                 || !strcasecmp("video", key.c_str())
@@ -753,6 +756,9 @@
             }
 
             key.tolower();
+            if (meta->get() == NULL) {
+                *meta = new AMessage;
+            }
             (*meta)->setString(key.c_str(), groupID.c_str());
         }
     }