diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:49:09 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:49:09 +0100 |
| commit | 3f0adfb1fba203580999496d7e4ca53e7aeb7621 (patch) | |
| tree | 2cc7032eefb9a58c8510e20507c82f90812e486b /src/plugins/directshow/player/directshowplayerservice.cpp | |
| parent | 01c1973c68e1ba0c505e1c07e0aa0652faccc0c5 (diff) | |
| parent | 5af70385a0b1a04e10d088f655ee33338ec014c5 (diff) | |
Merge 5.10 into 5.10.0
Change-Id: Id50796542954ded82fb265b4737d737aff033633
Diffstat (limited to 'src/plugins/directshow/player/directshowplayerservice.cpp')
| -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; |