summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2012-12-14 15:25:21 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-12-14 15:25:21 -0800
commit34d2f10908526cf3011d6c167a5817522b5a24d7 (patch)
tree96a6458583d26185b66a997b0ad19d92e6104066
parent761430930a7335d714af0f7c1d497feb8f9f0a5a (diff)
parent409542cdaf72d8983043f2746d9d916ee1566a80 (diff)
am 409542cd: Merge "FileSource: FILE is not closed"
* commit '409542cdaf72d8983043f2746d9d916ee1566a80': 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 7fe4e636..451c8376 100644
--- a/media/libstagefright/mp4/FragmentedMP4Parser.cpp
+++ b/media/libstagefright/mp4/FragmentedMP4Parser.cpp
@@ -132,6 +132,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);