summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2012-12-14 16:49:01 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-12-14 16:49:01 -0800
commitdc42966de62acc48f88183a50686717d8d8be9a4 (patch)
tree89cf2a107096cb6e23c8d80d8c8103355ab353e3
parentef3d158d102b64513ebb0707b49eb99566b067a6 (diff)
parent34d2f10908526cf3011d6c167a5817522b5a24d7 (diff)
downloadframeworks_av-dc42966de62acc48f88183a50686717d8d8be9a4.zip
frameworks_av-dc42966de62acc48f88183a50686717d8d8be9a4.tar.gz
frameworks_av-dc42966de62acc48f88183a50686717d8d8be9a4.tar.bz2
am 34d2f109: am 409542cd: Merge "FileSource: FILE is not closed"
* commit '34d2f10908526cf3011d6c167a5817522b5a24d7': FileSource: FILE is not closed
-rw-r--r--media/libstagefright/mp4/FragmentedMP4Parser.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/mp4/FragmentedMP4Parser.cpp b/media/libstagefright/mp4/FragmentedMP4Parser.cpp
index 6130d72..0102656 100644
--- a/media/libstagefright/mp4/FragmentedMP4Parser.cpp
+++ b/media/libstagefright/mp4/FragmentedMP4Parser.cpp
@@ -133,6 +133,10 @@ struct FileSource : public FragmentedMP4Parser::Source {
CHECK(mFile != NULL);
}
+ virtual ~FileSource() {
+ fclose(mFile);
+ }
+
virtual ssize_t readAt(off64_t offset, void *data, size_t size) {
fseek(mFile, offset, SEEK_SET);
return fread(data, 1, size, mFile);