summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-04-16 03:17:45 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-16 03:17:45 +0000
commitffb9710d2c6a323519f499e5900b16cd3cd067bd (patch)
tree723399c041d8f8339a28455214ccd7e34e013120
parentc08efe00b75f86dfdf92a6c2a996f8099af21e09 (diff)
parent5c16a3877c0b32f21cbee7f1bdc77a2a4d2b79c6 (diff)
downloadframeworks_av-ffb9710d2c6a323519f499e5900b16cd3cd067bd.zip
frameworks_av-ffb9710d2c6a323519f499e5900b16cd3cd067bd.tar.gz
frameworks_av-ffb9710d2c6a323519f499e5900b16cd3cd067bd.tar.bz2
am 5c16a387: am 382bcd5a: am 6a2dffb1: am 4491a4ab: Merge "libstagefright: free mMoovBoxBuffer"
* commit '5c16a3877c0b32f21cbee7f1bdc77a2a4d2b79c6': 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 9882695..3d83e83 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -841,6 +841,8 @@ void MPEG4Writer::release() {
mFd = -1;
mInitCheck = NO_INIT;
mStarted = false;
+ free(mMoovBoxBuffer);
+ mMoovBoxBuffer = NULL;
}
status_t MPEG4Writer::reset() {