diff options
| author | Wei Jia <wjia@google.com> | 2014-12-03 20:44:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-03 20:44:25 +0000 |
| commit | c7883e6a5381bbc96029f2dc9f949d6b2f8b3558 (patch) | |
| tree | fc472295dd84928d94975ab5ead90e982d218368 /media | |
| parent | 0ed7138903a85526a85d0cea8ff51b56d5aac236 (diff) | |
| parent | b783a70593c85493a2578dd8fbd7935f1bf00420 (diff) | |
| download | frameworks_av-c7883e6a5381bbc96029f2dc9f949d6b2f8b3558.zip frameworks_av-c7883e6a5381bbc96029f2dc9f949d6b2f8b3558.tar.gz frameworks_av-c7883e6a5381bbc96029f2dc9f949d6b2f8b3558.tar.bz2 | |
am b783a705: am ab05b4cc: StreamingSource: check mTSParser before dereferencing it.
* commit 'b783a70593c85493a2578dd8fbd7935f1bf00420':
StreamingSource: check mTSParser before dereferencing it.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/StreamingSource.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp index 27f5159..e54f5b9 100644 --- a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp +++ b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp @@ -139,6 +139,10 @@ status_t NuPlayer::StreamingSource::feedMoreTSData() { } sp<MetaData> NuPlayer::StreamingSource::getFormatMeta(bool audio) { + if (mTSParser == NULL) { + return NULL; + } + ATSParser::SourceType type = audio ? ATSParser::AUDIO : ATSParser::VIDEO; |