summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-04-16 02:55:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-16 02:55:00 +0000
commit382bcd5a63d3edba3950e120e452f4dd42c608c2 (patch)
tree89dbbf0ab3c53e293bab9ef19fb2257ed3be8f3d
parent0a4d22e5385755049bb2ebc684255ba5e9ae2ec7 (diff)
parent6a2dffb1c7a0e45388257bc5d2ec763f234f8cca (diff)
downloadframeworks_av-382bcd5a63d3edba3950e120e452f4dd42c608c2.zip
frameworks_av-382bcd5a63d3edba3950e120e452f4dd42c608c2.tar.gz
frameworks_av-382bcd5a63d3edba3950e120e452f4dd42c608c2.tar.bz2
am 6a2dffb1: am 4491a4ab: Merge "libstagefright: free mMoovBoxBuffer"
* commit '6a2dffb1c7a0e45388257bc5d2ec763f234f8cca': libstagefright: free mMoovBoxBuffer
-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() {