diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-15 09:10:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-15 09:10:51 +0100 |
| commit | 2e1c8dc10549da91cae75dddc3801fc8ed85fbcb (patch) | |
| tree | 2b709c7cbd6942dd3aadf7228a7338eb8b95549b /src/plugins/directshow | |
| parent | e3cf8e4da46302039d5c5eabb7baa2ffcfe3374d (diff) | |
| parent | cf4cc30da4566c1b8a86ee5688383f90eaf0e967 (diff) | |
| download | qtmultimedia-2e1c8dc10549da91cae75dddc3801fc8ed85fbcb.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I0e525d0cc7f4e4b776e5a536e2bf9b2c66be5429
Diffstat (limited to 'src/plugins/directshow')
| -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; |