diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-10-16 14:15:23 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-10-20 08:32:36 +0000 |
| commit | 3d3d2a4967ba079a3e6df82cdc89f839865e6649 (patch) | |
| tree | 360305944a20b4637fde5f96ac77fed5be3e2aa6 /src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h | |
| parent | 0cf41ef53f7b336509ed7d1ae6518655276af70f (diff) | |
GStreamer: fix compilation with version < 0.10.31.
Qt 5.4 and earlier required GStreamer 0.10.24 as minimum version.
Qt 5.5 added code that requires 0.10.31, this code is now ifdef'd
and we now support again 0.10.24.
Task-number: QTBUG-48353
Change-Id: Ie708a33c0515874b003ce26a3400475075d316ca
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Diffstat (limited to 'src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h')
| -rw-r--r-- | src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
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; |