diff options
| author | Andreas Huber <andih@google.com> | 2012-09-04 11:27:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-04 11:27:30 -0700 |
| commit | ac6d49fa95f3d255b9ca611ec139dce3fef9d907 (patch) | |
| tree | e226d7d6e9cf38507c7c70f3ac8d1ca2c5ca22ed /media/libmediaplayerservice | |
| parent | f5540a1218397e9cc5a381217ffbbc52332cf719 (diff) | |
| parent | eca95af88949ec76533927f39118ac57f4f01911 (diff) | |
| download | frameworks_av-ac6d49fa95f3d255b9ca611ec139dce3fef9d907.zip frameworks_av-ac6d49fa95f3d255b9ca611ec139dce3fef9d907.tar.gz frameworks_av-ac6d49fa95f3d255b9ca611ec139dce3fef9d907.tar.bz2 | |
am eca95af8: am fbe9d81f: Support for acting as a wifi display sink.
* commit 'eca95af88949ec76533927f39118ac57f4f01911':
Support for acting as a wifi display sink.
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index 564a256..62381c1 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -293,8 +293,8 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { break; } - if (mAudioDecoder == NULL && mAudioSink != NULL || - mVideoDecoder == NULL && mNativeWindow != NULL) { + if ((mAudioDecoder == NULL && mAudioSink != NULL) + || (mVideoDecoder == NULL && mNativeWindow != NULL)) { msg->post(100000ll); mScanSourcesPending = true; } |