diff options
author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-10-20 13:19:36 +0200 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-10-20 13:20:44 +0200 |
commit | ee8aca6c8771a92d558003ea5cf62e5236f21bb5 (patch) | |
tree | af9524ab0ee20930181f590fc6b3fb495028e7fd /src/multimedia/gsttools_headers | |
parent | f5235af0dc3aa433435dbd42b716776097af5acf (diff) | |
parent | 3d3d2a4967ba079a3e6df82cdc89f839865e6649 (diff) |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ie1e478eca1cdfd99ccd3a3c8a07aefbfa27ccbdb
Diffstat (limited to 'src/multimedia/gsttools_headers')
-rw-r--r-- | src/multimedia/gsttools_headers/qgstutils_p.h | 2 | ||||
-rw-r--r-- | src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/multimedia/gsttools_headers/qgstutils_p.h b/src/multimedia/gsttools_headers/qgstutils_p.h index 31fb85847..cf677c321 100644 --- a/src/multimedia/gsttools_headers/qgstutils_p.h +++ b/src/multimedia/gsttools_headers/qgstutils_p.h @@ -150,6 +150,8 @@ gboolean qt_gst_element_query_position(GstElement *element, GstFormat format, gi gboolean qt_gst_element_query_duration(GstElement *element, GstFormat format, gint64 *cur); GstCaps *qt_gst_caps_normalize(GstCaps *caps); const gchar *qt_gst_element_get_factory_name(GstElement *element); +gboolean qt_gst_caps_can_intersect(const GstCaps * caps1, const GstCaps * caps2); +GList *qt_gst_video_sinks(); QDebug operator <<(QDebug debug, GstCaps *caps); diff --git a/src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h b/src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h index a1ef5616b..9c04b9804 100644 --- a/src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h +++ b/src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h @@ -157,7 +157,12 @@ private: static gboolean unlock(GstBaseSink *sink); +#if GST_CHECK_VERSION(0, 10, 25) static GstFlowReturn show_frame(GstVideoSink *sink, GstBuffer *buffer); +#else + static GstFlowReturn preroll(GstBaseSink *sink, GstBuffer *buffer); + static GstFlowReturn render(GstBaseSink *sink, GstBuffer *buffer); +#endif private: QVideoSurfaceGstDelegate *delegate; |