diff options
| author | Wei Jia <wjia@google.com> | 2014-09-09 19:43:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-09 19:43:16 +0000 |
| commit | 2adbeda4f46f88ddb17519d39cc13e183741e071 (patch) | |
| tree | 07a5d63538a75c460af46058473cbefe54cd76ae /media | |
| parent | 9f8551ffa967bd8a4d0a52487a183dcf8b22d91f (diff) | |
| parent | f702d0415be7d5cb8c1801953b74adc1065c015e (diff) | |
| download | frameworks_av-2adbeda4f46f88ddb17519d39cc13e183741e071.zip frameworks_av-2adbeda4f46f88ddb17519d39cc13e183741e071.tar.gz frameworks_av-2adbeda4f46f88ddb17519d39cc13e183741e071.tar.bz2 | |
Merge "NuPlayer: check mSource before deferencing it." into lmp-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index c8bf8f0..a44de98 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -1244,7 +1244,8 @@ status_t NuPlayer::feedDecoderInputData(bool audio, const sp<AMessage> &msg) { CHECK(msg->findMessage("reply", &reply)); if ((audio && mFlushingAudio != NONE) - || (!audio && mFlushingVideo != NONE)) { + || (!audio && mFlushingVideo != NONE) + || mSource == NULL) { reply->setInt32("err", INFO_DISCONTINUITY); reply->post(); return OK; |