diff options
| author | Wei Jia <wjia@google.com> | 2014-09-09 21:55:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-09 21:55:25 +0000 |
| commit | 807ec0cb8cf4c6bd1ce4a48e3643db78ccf81534 (patch) | |
| tree | 1ad52eb20d7925623de7d169a45cbced550bf197 /media | |
| parent | 3a85e7b1fb12e6b15bca87400751a7558b4d257c (diff) | |
| parent | 2adbeda4f46f88ddb17519d39cc13e183741e071 (diff) | |
| download | frameworks_av-807ec0cb8cf4c6bd1ce4a48e3643db78ccf81534.zip frameworks_av-807ec0cb8cf4c6bd1ce4a48e3643db78ccf81534.tar.gz frameworks_av-807ec0cb8cf4c6bd1ce4a48e3643db78ccf81534.tar.bz2 | |
am 2adbeda4: Merge "NuPlayer: check mSource before deferencing it." into lmp-dev
* commit '2adbeda4f46f88ddb17519d39cc13e183741e071':
NuPlayer: check mSource before deferencing it.
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; |