2 files changed, 13 insertions, 4 deletions
diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.cpp b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
index 1f75e3340..84f990830 100644
--- a/src/plugins/directshow/player/directshowmetadatacontrol.cpp
+++ b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
@@ -624,9 +624,7 @@ void DirectShowMetaDataControl::updateMetadata(IFilterGraph2 *graph, IBaseFilter
 #endif
 
 #if QT_CONFIG(wmsdk)
-    IWMHeaderInfo *info = com_cast<IWMHeaderInfo>(source, IID_IWMHeaderInfo);
-
-    if (info) {
+    if (IWMHeaderInfo *info = com_cast<IWMHeaderInfo>(source, IID_IWMHeaderInfo)) {
         const auto keys = *qt_wmMetaDataKeys();
         for (const QWMMetaDataKey &key : keys) {
             QVariant var = getValue(info, key.wmName);
diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp
index de427f781..2f959b232 100644
--- a/src/plugins/directshow/player/directshowplayerservice.cpp
+++ b/src/plugins/directshow/player/directshowplayerservice.cpp
@@ -674,6 +674,9 @@ void DirectShowPlayerService::doReleaseGraph(QMutexLocker *locker)
     m_loop->wake();
 }
 
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_GCC("-Wmissing-field-initializers")
+
 void DirectShowPlayerService::doSetVideoProbe(QMutexLocker *locker)
 {
     Q_UNUSED(locker);
@@ -721,9 +724,10 @@ void DirectShowPlayerService::doSetVideoProbe(QMutexLocker *locker)
     for (int i = 0; i != items; ++i) {
         mediaType->subtype = subtypes[i];
         m_videoSampleGrabber->setMediaType(&mediaType);
-        if (SUCCEEDED(DirectShowUtils::connectFilters(m_graph, m_source, m_videoSampleGrabber->filter(), true)))
+        if (SUCCEEDED(DirectShowUtils::connectFilters(m_graph, m_source, m_videoSampleGrabber->filter(), true))) {
             connected = true;
             break;
+        }
     }
 
     if (!connected) {
@@ -765,6 +769,8 @@ void DirectShowPlayerService::doSetAudioProbe(QMutexLocker *locker)
     m_audioSampleGrabber->start(DirectShowSampleGrabber::CallbackMethod::BufferCB);
 }
 
+QT_WARNING_POP
+
 void DirectShowPlayerService::doReleaseVideoProbe(QMutexLocker *locker)
 {
     Q_UNUSED(locker);
@@ -1444,6 +1450,9 @@ void DirectShowPlayerService::videoOutputChanged()
     setVideoOutput(m_videoRendererControl->filter());
 }
 
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_GCC("-Wmissing-field-initializers")
+
 void DirectShowPlayerService::onAudioBufferAvailable(double time, quint8 *buffer, long len)
 {
     QMutexLocker locker(&m_mutex);
@@ -1535,6 +1544,8 @@ void DirectShowPlayerService::onVideoBufferAvailable(double time, quint8 *buffer
     Q_EMIT m_videoProbeControl->videoFrameProbed(frame);
 }
 
+QT_WARNING_POP
+
 void DirectShowPlayerService::graphEvent(QMutexLocker *locker)
 {
     Q_UNUSED(locker)