summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2018-09-25 16:56:07 +0300
committerSebastian Dröge <sebastian@centricular.com>2018-09-25 17:01:15 +0300
commit64774ece0c6f5e960626d0f67b137800f97b851e (patch)
tree969db885aba915562036eb3bd94cfb662a725733
parentd002cd33d377075bcfd1b04b09edd3687c79ae3a (diff)
downloadgst-plugins-base-64774ece0c6f5e960626d0f67b137800f97b851e.tar.gz
gst-plugins-base-64774ece0c6f5e960626d0f67b137800f97b851e.tar.xz
glcolorconvert: Don't copy overlay composition meta over to NULL outbufs
-rw-r--r--gst-libs/gst/gl/gstglcolorconvert.c16
1 files 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;