diff options
author | Wei Jia <wjia@google.com> | 2014-09-26 15:27:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-26 15:27:48 +0000 |
commit | 92001302180afe70564e692e29cf6a878c14b88e (patch) | |
tree | 30e768962e06c0af8fa0b5d0498189eb911edd3e | |
parent | e0a2c77a44c2b8d245ae5284bf5fcd0a97efcd6e (diff) | |
parent | 18e10cb19395ba8758d484cb962c9f38e30adba4 (diff) | |
download | frameworks_av-92001302180afe70564e692e29cf6a878c14b88e.zip frameworks_av-92001302180afe70564e692e29cf6a878c14b88e.tar.gz frameworks_av-92001302180afe70564e692e29cf6a878c14b88e.tar.bz2 |
am 18e10cb1: am 0ed72488: Merge "NuPlayer: use format obtained from source to tell if video exists." into lmp-dev
* commit '18e10cb19395ba8758d484cb962c9f38e30adba4':
NuPlayer: use format obtained from source to tell if video exists.
-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) |