| commit | 6f444c95d86936217bf49fc11d279851b0fa364d | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Thu Jan 19 14:40:44 2012 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jan 19 14:40:44 2012 -0800 |
| tree | cc4f211aed6385dfd9d6bccbc2f7e4fc68128823 | |
| parent | aeeb7e219e34d2d657d829913659a4e10e976375 [diff] | |
| parent | bd9c9a80fd487b3e83861c32b388eac146f8a299 [diff] |
Merge "Make sure the ThrottledSource reports the proper mime type"
diff --git a/media/libstagefright/include/ThrottledSource.h b/media/libstagefright/include/ThrottledSource.h index 8928a4a..7fe7c06 100644 --- a/media/libstagefright/include/ThrottledSource.h +++ b/media/libstagefright/include/ThrottledSource.h
@@ -35,6 +35,11 @@ virtual status_t getSize(off64_t *size); virtual uint32_t flags(); + virtual String8 getMIMEType() const { + return mSource->getMIMEType(); + } + + private: Mutex mLock;