diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:29:51 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:29:51 +0100 |
| commit | b07a7d79f3080892d381c40ec79679450bda5431 (patch) | |
| tree | 316f69a3e3e557602f195e41284fb35bf264c8b6 /src/gsttools/qgstreamerplayersession.cpp | |
| parent | 1057d6a89ab4c19825ab2d5d12aed31496b89423 (diff) | |
| parent | c296df781d9fa445bb4b1fcbb6f340e0d1db0c3a (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Ie0a7534d518cd5758119edc77d8275ac3da2037c
Diffstat (limited to 'src/gsttools/qgstreamerplayersession.cpp')
| -rw-r--r-- | src/gsttools/qgstreamerplayersession.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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; |