summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-04-16 02:44:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-16 02:44:45 +0000
commit6a2dffb1c7a0e45388257bc5d2ec763f234f8cca (patch)
tree6d06642eeef11d989e40b8d6f786076c1444b100 /media
parent9985f6af71061c9340fffa9a6e7c8fea5dac04ab (diff)
parent4491a4ab2d6991baa1ce15f24025aa24430d15d1 (diff)
downloadframeworks_av-6a2dffb1c7a0e45388257bc5d2ec763f234f8cca.zip
frameworks_av-6a2dffb1c7a0e45388257bc5d2ec763f234f8cca.tar.gz
frameworks_av-6a2dffb1c7a0e45388257bc5d2ec763f234f8cca.tar.bz2
am 4491a4ab: Merge "libstagefright: free mMoovBoxBuffer"
* commit '4491a4ab2d6991baa1ce15f24025aa24430d15d1': libstagefright: free mMoovBoxBuffer
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/MPEG4Writer.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index 91d9db5..844a019 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -823,6 +823,8 @@ void MPEG4Writer::release() {
mFd = -1;
mInitCheck = NO_INIT;
mStarted = false;
+ free(mMoovBoxBuffer);
+ mMoovBoxBuffer = NULL;
}
status_t MPEG4Writer::reset() {