From 4e47d0a710452cfba62a8a3c2c2ce5c118bc00fe Mon Sep 17 00:00:00 2001
From: Val Doroshchuk <valentyn.doroshchuk@qt.io>
Date: Mon, 11 Feb 2019 11:40:22 +0100
Subject: [PATCH] Gstreamer: Fix compilation error with 0.10 version
Task-number: QTBUG-73740
Change-Id: I1de087b63f65bab39351d5446254a8d1832e88c3
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
---
src/gsttools/qgstutils.cpp | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp
index 24372f7ae..58dd6e5fe 100644
--- a/src/gsttools/qgstutils.cpp
+++ b/src/gsttools/qgstutils.cpp
@@ -1309,8 +1309,7 @@ void QGstUtils::setMetaData(GstBin *bin, const QMap<QByteArray, QVariant> &data)
GstCaps *QGstUtils::videoFilterCaps()
{
- static GstStaticCaps staticCaps = {
- NULL,
+ const char *caps =
#if GST_CHECK_VERSION(1,2,0)
"video/x-raw(ANY);"
#elif GST_CHECK_VERSION(1,0,0)
@@ -1322,9 +1321,8 @@ GstCaps *QGstUtils::videoFilterCaps()
"video/x-android-buffer;"
#endif
"image/jpeg;"
- "video/x-h264",
- GST_PADDING_INIT
- };
+ "video/x-h264";
+ static GstStaticCaps staticCaps = GST_STATIC_CAPS(caps);
return gst_caps_make_writable(gst_static_caps_get(&staticCaps));
}
--
GitLab