diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:17:23 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:17:23 +0100 |
| commit | 45cbaf2a8158f5972e3362f7e777d3263d7c7916 (patch) | |
| tree | 329c9ccd8d6bb9c2e11d98ed9149c714c04ca987 /src/plugins/directshow/player | |
| parent | cf43124fcbea64f15f0800f090fdf885e08019c7 (diff) | |
| parent | 5af70385a0b1a04e10d088f655ee33338ec014c5 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Icaf645e271b21320c4cb6269178d9e722092a263
Diffstat (limited to 'src/plugins/directshow/player')
| -rw-r--r-- | src/plugins/directshow/player/directshowplayerservice.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp index 9cbb62969..8ee5d67a1 100644 --- a/src/plugins/directshow/player/directshowplayerservice.cpp +++ b/src/plugins/directshow/player/directshowplayerservice.cpp @@ -402,7 +402,6 @@ void DirectShowPlayerService::doSetUrlSource(QMutexLocker *locker) } else if (!m_resources.isEmpty()) { m_pendingTasks |= SetUrlSource; } else { - m_pendingTasks = 0; m_graphStatus = InvalidMedia; switch (hr) { @@ -1688,8 +1687,6 @@ void DirectShowPlayerService::run() QMutexLocker locker(&m_mutex); for (;;) { - ::ResetEvent(m_taskHandle); - while (m_pendingTasks == 0) { DWORD result = 0; |