diff options
| author | James Dong <jdong@google.com> | 2012-04-17 13:07:56 -0700 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2012-04-26 11:27:43 -0700 |
| commit | 514bcaf1e842e8e90fbeabf35e7e654622b75b02 (patch) | |
| tree | f3618f1e77ee62d210395dc63623779e58094ea9 /media/libstagefright/include | |
| parent | 0756aa99dffd5740d963fdda60699fdefe58ce85 (diff) | |
| download | frameworks_av-514bcaf1e842e8e90fbeabf35e7e654622b75b02.zip frameworks_av-514bcaf1e842e8e90fbeabf35e7e654622b75b02.tar.gz frameworks_av-514bcaf1e842e8e90fbeabf35e7e654622b75b02.tar.bz2 | |
Handle the case when there is no timed text track
o also replaced mTimedTextLock with mLock, since there is no particular reason to use a separate lock for timed text
o related-to-bug: 6110705
Change-Id: Ia687e96956692c42d492e57992e5721ca1e8e18b
Diffstat (limited to 'media/libstagefright/include')
| -rw-r--r-- | media/libstagefright/include/AwesomePlayer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h index 9115f91..a2e2e85 100644 --- a/media/libstagefright/include/AwesomePlayer.h +++ b/media/libstagefright/include/AwesomePlayer.h @@ -232,7 +232,6 @@ private: int64_t mLastVideoTimeUs; TimedTextDriver *mTextDriver; - mutable Mutex mTimedTextLock; sp<WVMExtractor> mWVMExtractor; sp<MediaExtractor> mExtractor; |