diff options
| author | Robert Shih <robertshih@google.com> | 2014-11-10 18:25:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-10 18:25:33 +0000 |
| commit | 2dc28b69258d4772aaf40902b939153239e7fe7f (patch) | |
| tree | 010f2d21a21dd55e7b5d2bfe3bd56918912e76f3 /media/libmediaplayerservice | |
| parent | c5208b7a23300c0f628a4dab3a22536e351da18b (diff) | |
| parent | 1098d87e56f726184ae9c8fe903ea4743669f35b (diff) | |
| download | frameworks_av-2dc28b69258d4772aaf40902b939153239e7fe7f.zip frameworks_av-2dc28b69258d4772aaf40902b939153239e7fe7f.tar.gz frameworks_av-2dc28b69258d4772aaf40902b939153239e7fe7f.tar.bz2 | |
Merge "HTTPLiveSource: NULL check in getFormat" into lmp-mr1-dev
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp b/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp index a003c81..02e9caf 100644 --- a/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp +++ b/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp @@ -98,6 +98,10 @@ void NuPlayer::HTTPLiveSource::start() { } sp<AMessage> NuPlayer::HTTPLiveSource::getFormat(bool audio) { + if (mLiveSession == NULL) { + return NULL; + } + sp<AMessage> format; status_t err = mLiveSession->getStreamFormat( audio ? LiveSession::STREAMTYPE_AUDIO |