diff options
| author | Andreas Huber <andih@google.com> | 2010-09-09 13:48:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-09 13:48:53 -0700 |
| commit | 1432a0075c0f638206a8e59e33cc81d5caea4bcf (patch) | |
| tree | f5a6717734c6a5bf5bf184beb98ef9e11afafc58 /media/libstagefright/include | |
| parent | 9b2cef27bbe953c0b5c37ada9bf18d706c396513 (diff) | |
| parent | 84cd8adafe0bbfc1af775c9d9a69ec988cb05714 (diff) | |
| download | frameworks_av-1432a0075c0f638206a8e59e33cc81d5caea4bcf.zip frameworks_av-1432a0075c0f638206a8e59e33cc81d5caea4bcf.tar.gz frameworks_av-1432a0075c0f638206a8e59e33cc81d5caea4bcf.tar.bz2 | |
am f0eab98c: am a063cd64: Merge "Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content." into gingerbread
Merge commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3'
* commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3':
Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.
Diffstat (limited to 'media/libstagefright/include')
| -rw-r--r-- | media/libstagefright/include/MP3Extractor.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/libstagefright/include/MP3Extractor.h b/media/libstagefright/include/MP3Extractor.h index 0e6ccde..30136e7 100644 --- a/media/libstagefright/include/MP3Extractor.h +++ b/media/libstagefright/include/MP3Extractor.h @@ -37,10 +37,9 @@ public: virtual sp<MetaData> getMetaData(); -protected: - virtual ~MP3Extractor(); - private: + status_t mInitCheck; + sp<DataSource> mDataSource; off_t mFirstFramePos; sp<MetaData> mMeta; |