diff options
| author | Lajos Molnar <lajos@google.com> | 2014-12-11 16:11:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-11 16:11:43 +0000 |
| commit | b6ac4d49e468e155aa1591f3c400e1c06442e7b1 (patch) | |
| tree | 77ff44f19744afc794791d3c2b47a7ac9088b45b /media | |
| parent | 78e179e62b2b6e1e2736163162248ace06d30cdb (diff) | |
| parent | 2253b3c50ee4b89349553f42edf676ce8579e680 (diff) | |
| download | frameworks_av-b6ac4d49e468e155aa1591f3c400e1c06442e7b1.zip frameworks_av-b6ac4d49e468e155aa1591f3c400e1c06442e7b1.tar.gz frameworks_av-b6ac4d49e468e155aa1591f3c400e1c06442e7b1.tar.bz2 | |
am 2253b3c5: am f484952e: mediaplayer: allow setVideoSurface before setDataSource
* commit '2253b3c50ee4b89349553f42edf676ce8579e680':
mediaplayer: allow setVideoSurface before setDataSource
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 d433a4d..080cd52 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -537,7 +537,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { sp<RefBase> obj; CHECK(msg->findObject("native-window", &obj)); - if (mSource->getFormat(false /* audio */) == NULL) { + if (mSource == NULL || mSource->getFormat(false /* audio */) == NULL) { performSetSurface(static_cast<NativeWindowWrapper *>(obj.get())); break; } |