diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-05 10:10:26 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-05 10:10:26 +0100 |
| commit | 11df4e75e4eca82d28dc147fcefb29d62b38a5dc (patch) | |
| tree | 36f7593c1f5d48123127a918ec23c6fe47b8169a /src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h | |
| parent | 318159c8492883d7ef29804a68c398cceaa5f89a (diff) | |
| parent | 3ef5831041fe1206043f3b36f063eef4842ce243 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I64a2e98adeb387e532f0b22129ade7ca7e8dc22a
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; |