diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-06 09:47:33 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-06 09:47:33 +0100 |
| commit | 7a3b8907060123fe5d487d4c9ba3a1e222f468bb (patch) | |
| tree | cb419d68eedddc1adbd6dbb84888767edc7fb3bf /src/plugins/directshow/player/directshowplayerservice.h | |
| parent | 4a6f459d193b621a77e002944eb28e4e96f2e2c7 (diff) | |
| parent | 13df2988efbe9a82225ccbf4cad463391d94c8e8 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
Change-Id: I3d6e69f3f99b2f0a0e2c29ffdd02176e1f22304e
Diffstat (limited to 'src/plugins/directshow/player/directshowplayerservice.h')
| -rw-r--r-- | src/plugins/directshow/player/directshowplayerservice.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/directshow/player/directshowplayerservice.h b/src/plugins/directshow/player/directshowplayerservice.h index 01d05449e..cc7b4dd3e 100644 --- a/src/plugins/directshow/player/directshowplayerservice.h +++ b/src/plugins/directshow/player/directshowplayerservice.h @@ -124,6 +124,7 @@ private: void run(); + void doCreateGraph(QMutexLocker *locker); void doSetUrlSource(QMutexLocker *locker); void doSetStreamSource(QMutexLocker *locker); void doRender(QMutexLocker *locker); @@ -169,7 +170,8 @@ private: ReleaseVideoProbe = 0x40000, ReleaseFilters = ReleaseGraph | ReleaseAudioOutput | ReleaseVideoOutput | ReleaseAudioProbe - | ReleaseVideoProbe + | ReleaseVideoProbe, + CreateGraph = 0x80000 }; enum Event |