summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/multimedia/playback/qmediaplayer.cpp5
-rw-r--r--src/plugins/winrt/qwinrtcameracontrol.cpp3
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;
}