summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/mp4
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
commit432e1d8013157a66383d9256541f2f8712e4cf5a (patch)
tree7dbe5de932beb4935c0caa3cab47d9df50d42b52 /media/libstagefright/mp4
parent10174bfdac537730be6729b9d47ad7d5bafed072 (diff)
parentda99f77816e04f7ea3dafcb371e84d070f5b312a (diff)
downloadframeworks_av-432e1d8013157a66383d9256541f2f8712e4cf5a.zip
frameworks_av-432e1d8013157a66383d9256541f2f8712e4cf5a.tar.gz
frameworks_av-432e1d8013157a66383d9256541f2f8712e4cf5a.tar.bz2
am 34d2f109: am 409542cd: Merge "FileSource: FILE is not closed"
* commit '34d2f10908526cf3011d6c167a5817522b5a24d7': FileSource: FILE is not closed
Diffstat (limited to 'media/libstagefright/mp4')
-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);