diff options
| author | Andreas Huber <andih@google.com> | 2010-10-16 09:14:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-16 09:14:06 -0700 |
| commit | 8f9486c1adb396d20b439da7141e5eb0f81166e2 (patch) | |
| tree | a39dc2975f1edc856c27d13ce1e6ea3ebac2f245 /media | |
| parent | da3fe88b2dbc1f731760162d1d9420afca9c19e6 (diff) | |
| parent | cb90947bf8ed2c898c1b7e529dd0c99d112ed611 (diff) | |
| download | frameworks_base-8f9486c1adb396d20b439da7141e5eb0f81166e2.zip frameworks_base-8f9486c1adb396d20b439da7141e5eb0f81166e2.tar.gz frameworks_base-8f9486c1adb396d20b439da7141e5eb0f81166e2.tar.bz2 | |
am cb90947b: am e1f3976b: Merge "Make sure we cache the sampleTable again if using the caching datasource." into gingerbread
Merge commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611'
* commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611':
Make sure we cache the sampleTable again if using the caching datasource.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 4bbc251..f404708 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -498,7 +498,9 @@ status_t MPEG4Extractor::parseChunk(off_t *offset, int depth) { if (chunk_type == FOURCC('s', 't', 'b', 'l')) { LOGV("sampleTable chunk is %d bytes long.", (size_t)chunk_size); - if (mDataSource->flags() & DataSource::kWantsPrefetching) { + if (mDataSource->flags() + & (DataSource::kWantsPrefetching + | DataSource::kIsCachingDataSource)) { sp<MPEG4DataSource> cachedSource = new MPEG4DataSource(mDataSource); |