summaryrefslogtreecommitdiffstats
path: root/media
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
commitda99f77816e04f7ea3dafcb371e84d070f5b312a (patch)
tree730ff1f334d635641c9d1e59f3e116c46261c202 /media
parenta4f324673f615d604362d86e1878e85c126847af (diff)
parent16ffd2e30bedbec15b9015f1935b9761279a98be (diff)
downloadframeworks_av-da99f77816e04f7ea3dafcb371e84d070f5b312a.zip
frameworks_av-da99f77816e04f7ea3dafcb371e84d070f5b312a.tar.gz
frameworks_av-da99f77816e04f7ea3dafcb371e84d070f5b312a.tar.bz2
am 409542cd: Merge "FileSource: FILE is not closed"
* commit '409542cdaf72d8983043f2746d9d916ee1566a80': FileSource: FILE is not closed
Diffstat (limited to 'media')
-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 7fe4e63..451c837 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);