summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/DataSource.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-03-30 11:26:04 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-30 11:26:04 -0700
commit72bbbff2dfb120ed1ebc9a50e8509364508bfa70 (patch)
tree60019bcc72da9db304cf1b56d1db5160eb521a39 /media/libstagefright/DataSource.cpp
parent70d3e260edcd42972864bf501337f0b1a187657d (diff)
parent6511c9755c3a3360ba869772600c7aae048a7ffc (diff)
downloadframeworks_av-72bbbff2dfb120ed1ebc9a50e8509364508bfa70.zip
frameworks_av-72bbbff2dfb120ed1ebc9a50e8509364508bfa70.tar.gz
frameworks_av-72bbbff2dfb120ed1ebc9a50e8509364508bfa70.tar.bz2
Merge "Stagefright DataSources now expose the underlying content mime type."
Diffstat (limited to 'media/libstagefright/DataSource.cpp')
-rw-r--r--media/libstagefright/DataSource.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/DataSource.cpp b/media/libstagefright/DataSource.cpp
index b5c51f4..7c2096e 100644
--- a/media/libstagefright/DataSource.cpp
+++ b/media/libstagefright/DataSource.cpp
@@ -144,4 +144,8 @@ sp<DataSource> DataSource::CreateFromURI(
return source;
}
+String8 DataSource::getMIMEType() const {
+ return String8("application/octet-stream");
+}
+
} // namespace android