diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:01:58 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:01:58 +0100 |
| commit | 2e9d1fa5ef1367e5d2ace88bc47f93b8fe8a039b (patch) | |
| tree | e34abd8ef99ae1abb2730a3772debe3fc9b26144 /src/plugins/directshow/player/directshowplayerservice.h | |
| parent | b8609cd3ffeddd02a514c6b5f9170c8017966e41 (diff) | |
| parent | 7638848d2486e2fac9764b60a99de08f50adc8eb (diff) | |
| download | qtmultimedia-2e9d1fa5ef1367e5d2ace88bc47f93b8fe8a039b.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I7566f543ce11ff6cddc4d17e2c258a582f365b65
Diffstat (limited to 'src/plugins/directshow/player/directshowplayerservice.h')
| -rw-r--r-- | src/plugins/directshow/player/directshowplayerservice.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/directshow/player/directshowplayerservice.h b/src/plugins/directshow/player/directshowplayerservice.h index cc7b4dd3e..01d05449e 100644 --- a/src/plugins/directshow/player/directshowplayerservice.h +++ b/src/plugins/directshow/player/directshowplayerservice.h @@ -124,7 +124,6 @@ private: void run(); - void doCreateGraph(QMutexLocker *locker); void doSetUrlSource(QMutexLocker *locker); void doSetStreamSource(QMutexLocker *locker); void doRender(QMutexLocker *locker); @@ -170,8 +169,7 @@ private: ReleaseVideoProbe = 0x40000, ReleaseFilters = ReleaseGraph | ReleaseAudioOutput | ReleaseVideoOutput | ReleaseAudioProbe - | ReleaseVideoProbe, - CreateGraph = 0x80000 + | ReleaseVideoProbe }; enum Event |