diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-05 03:01:29 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-05 03:01:29 +0200 |
| commit | e2d022c48e50aa23469d861cc382910fda594994 (patch) | |
| tree | 09954b979bd05e7e802e662c3d35866eb8eb5967 /src | |
| parent | 46518fa76c83de9a3a9edc870539a9e8b7eaef9f (diff) | |
| parent | 5b7bd00d2c03f7035b21534003662e931bd04eb8 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I0d6a2d60122f768b56980029b83e79f00cceb428
Diffstat (limited to 'src')
| -rw-r--r-- | src/multimedia/playback/qmediaplayer.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/winrt/qwinrtcameracontrol.cpp | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 01c91babc..19d4ec42c 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -564,8 +564,9 @@ static QMediaService *playerService(QMediaPlayer::Flags flags) return provider->requestService(Q_MEDIASERVICE_MEDIAPLAYER, QMediaServiceProviderHint(features)); - } else - return provider->requestService(Q_MEDIASERVICE_MEDIAPLAYER); + } + + return provider->requestService(Q_MEDIASERVICE_MEDIAPLAYER); } diff --git a/src/plugins/winrt/qwinrtcameracontrol.cpp b/src/plugins/winrt/qwinrtcameracontrol.cpp index 99d754289..0eec4a2ca 100644 --- a/src/plugins/winrt/qwinrtcameracontrol.cpp +++ b/src/plugins/winrt/qwinrtcameracontrol.cpp @@ -283,6 +283,7 @@ public: HRESULT __stdcall GetMediaSink(IMFMediaSink **mediaSink) override { + m_sink->AddRef(); *mediaSink = m_sink; return S_OK; } @@ -1345,7 +1346,7 @@ HRESULT QWinRTCameraControl::onInitializationCompleted(IAsyncAction *, AsyncStat if (status != Completed) { d->initializing = false; - d->initialized = true; + d->initialized = false; return S_OK; } |