|
@@ -1,36 +0,0 @@
|
|
-From 935967a453b47ae7c8e9ad3d94eef3813eab58db Mon Sep 17 00:00:00 2001
|
|
|
|
-From: Richard Oehlinger <richard.oehlinger@adbsafegate.com>
|
|
|
|
-Date: Mon, 18 Mar 2019 10:15:13 +0100
|
|
|
|
-Subject: [PATCH] Fix compile failure with gstreamer 0.10
|
|
|
|
-
|
|
|
|
-This fixes an compile failure introduced in commit 67c4ec55.
|
|
|
|
-
|
|
|
|
-Fixes: QTBUG-74475
|
|
|
|
-Change-Id: I0dabb72f8b5cdd75336b15515381ff9d9442788f
|
|
|
|
-Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
|
|
|
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
|
|
-[Retrieved from:
|
|
|
|
-https://github.com/qt/qtmultimedia/commit/935967a453b47ae7c8e9ad3d94eef3813eab58db]
|
|
|
|
----
|
|
|
|
- src/gsttools/qgstreamerplayersession.cpp | 5 +++++
|
|
|
|
- 1 file changed, 5 insertions(+)
|
|
|
|
-
|
|
|
|
-diff --git a/src/gsttools/qgstreamerplayersession.cpp b/src/gsttools/qgstreamerplayersession.cpp
|
|
|
|
-index f21c94c5c..9858f61c9 100644
|
|
|
|
---- a/src/gsttools/qgstreamerplayersession.cpp
|
|
|
|
-+++ b/src/gsttools/qgstreamerplayersession.cpp
|
|
|
|
-@@ -402,9 +402,14 @@ void QGstreamerPlayerSession::setPipeline(GstElement *pipeline)
|
|
|
|
-
|
|
|
|
- if (m_renderer) {
|
|
|
|
- auto it = gst_bin_iterate_sinks(GST_BIN(pipeline));
|
|
|
|
-+#if GST_CHECK_VERSION(1,0,0)
|
|
|
|
- GValue data = { 0, 0 };
|
|
|
|
- while (gst_iterator_next (it, &data) == GST_ITERATOR_OK) {
|
|
|
|
- auto child = static_cast<GstElement*>(g_value_get_object(&data));
|
|
|
|
-+#else
|
|
|
|
-+ GstElement *child = nullptr;
|
|
|
|
-+ while (gst_iterator_next(it, reinterpret_cast<gpointer *>(&child)) == GST_ITERATOR_OK) {
|
|
|
|
-+#endif
|
|
|
|
- if (QLatin1String(GST_OBJECT_NAME(child)) == QLatin1String("qtvideosink")) {
|
|
|
|
- m_renderer->setVideoSink(child);
|
|
|
|
- break;
|
|
|