From 64774ece0c6f5e960626d0f67b137800f97b851e Mon Sep 17 00:00:00 2001 From: Sebastian Dröge Date: Tue, 25 Sep 2018 16:56:07 +0300 Subject: glcolorconvert: Don't copy overlay composition meta over to NULL outbufs --- gst-libs/gst/gl/gstglcolorconvert.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gst-libs/gst/gl/gstglcolorconvert.c b/gst-libs/gst/gl/gstglcolorconvert.c index ccad1d680..324773528 100644 --- a/gst-libs/gst/gl/gstglcolorconvert.c +++ b/gst-libs/gst/gl/gstglcolorconvert.c @@ -2387,7 +2387,6 @@ _do_convert (GstGLContext * context, GstGLColorConvert * convert) struct ConvertInfo *c_info = &convert->priv->convert_info; gboolean res = TRUE; gint views, v; - GstVideoOverlayCompositionMeta *composition_meta; GstGLSyncMeta *sync_meta; GstFlowReturn ret; @@ -2503,19 +2502,20 @@ _do_convert (GstGLContext * context, GstGLColorConvert * convert) } if (convert->outbuf) { + GstVideoOverlayCompositionMeta *composition_meta; GstGLSyncMeta *sync_meta = gst_buffer_add_gl_sync_meta (convert->context, convert->outbuf); if (sync_meta) gst_gl_sync_meta_set_sync_point (sync_meta, convert->context); - } - composition_meta = - gst_buffer_get_video_overlay_composition_meta (convert->inbuf); - if (composition_meta) { - GST_DEBUG ("found video overlay composition meta, applying on output."); - gst_buffer_add_video_overlay_composition_meta - (convert->outbuf, composition_meta->overlay); + composition_meta = + gst_buffer_get_video_overlay_composition_meta (convert->inbuf); + if (composition_meta) { + GST_DEBUG ("found video overlay composition meta, applying on output."); + gst_buffer_add_video_overlay_composition_meta + (convert->outbuf, composition_meta->overlay); + } } convert->priv->result = res; -- cgit v1.2.3