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 | 09359d4e7b9186eec9ce744257a8d1dcb6cbbf15 (patch) | |
| tree | e2139bf7738f4cd4d942e9522599ecb5084e4eea /media/libmediaplayerservice | |
| parent | 23ed3d9cd183c845bed846ecf050aa8cbd6f4c0f (diff) | |
| parent | 04b1b910664c87b4bd593176ba59e43c5ddfd162 (diff) | |
| download | frameworks_av-09359d4e7b9186eec9ce744257a8d1dcb6cbbf15.zip frameworks_av-09359d4e7b9186eec9ce744257a8d1dcb6cbbf15.tar.gz frameworks_av-09359d4e7b9186eec9ce744257a8d1dcb6cbbf15.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; } |