diff options
| author | Wei Jia <wjia@google.com> | 2014-09-26 04:30:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-26 04:30:56 +0000 |
| commit | 18e10cb19395ba8758d484cb962c9f38e30adba4 (patch) | |
| tree | 501c802a8943bd6ae805e52aa72a3eeff29a3860 /media | |
| parent | 6ff947631cda2e3d4e47f97616dc70fd320d2c4a (diff) | |
| parent | 0ed72488feba74904d25ebc91bda60c6b1d0af55 (diff) | |
| download | frameworks_av-18e10cb19395ba8758d484cb962c9f38e30adba4.zip frameworks_av-18e10cb19395ba8758d484cb962c9f38e30adba4.tar.gz frameworks_av-18e10cb19395ba8758d484cb962c9f38e30adba4.tar.bz2 | |
am 0ed72488: Merge "NuPlayer: use format obtained from source to tell if video exists." into lmp-dev
* commit '0ed72488feba74904d25ebc91bda60c6b1d0af55':
NuPlayer: use format obtained from source to tell if video exists.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index ef4abd4..ca596fd 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -559,7 +559,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { static_cast<NativeWindowWrapper *>(obj.get()))); if (obj != NULL) { - if (mStarted && mVideoDecoder != NULL) { + if (mStarted && mSource->getFormat(false /* audio */) != NULL) { // Issue a seek to refresh the video screen only if started otherwise // the extractor may not yet be started and will assert. // If the video decoder is not set (perhaps audio only in this case) |