From 14c884d9cfb97d889af1ae17da903890e519275c Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 20 Jun 2017 12:52:39 +0200
Subject: [PATCH] DirectShow: Silence g++ warnings about missing initializers
for AM_MEDIA_TYPE
Change-Id: I9f764077d257dadfe1641e9bd446b6939c381173
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
---
.../directshow/player/directshowplayerservice.cpp | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp
index de427f781..905e03dfd 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);
@@ -765,6 +768,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 +1449,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 +1543,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)
--
GitLab