diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:23:28 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:23:28 +0200 |
| commit | f979916804fdcea14e2a560336f31f4046fbe84a (patch) | |
| tree | b5ff5737a4a9dd187c056b010e329ed1d601db0f /src/plugins/directshow/player/directshowplayerservice.cpp | |
| parent | 9bdc7c84eea0ff66c937d5f62ffed249321c3c35 (diff) | |
| parent | 339944b284e9dd11302dd013f9d9a10ad0d9055a (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
tests/auto/integration/qsoundeffect/BLACKLIST
Change-Id: Icd2edd4410a4ee914d489634d26b262c0c146bf4
Diffstat (limited to 'src/plugins/directshow/player/directshowplayerservice.cpp')
| -rw-r--r-- | src/plugins/directshow/player/directshowplayerservice.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp index d0c342ed4..1502c6df3 100644 --- a/src/plugins/directshow/player/directshowplayerservice.cpp +++ b/src/plugins/directshow/player/directshowplayerservice.cpp @@ -528,8 +528,6 @@ void DirectShowPlayerService::doRender(QMutexLocker *locker) m_executedTasks |= Render; } - - m_loop->wake(); } void DirectShowPlayerService::doFinalizeLoad(QMutexLocker *locker) |