summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Waters <matthew@centricular.com>2015-11-10 12:32:39 +1100
committerMatthew Waters <matthew@centricular.com>2015-11-10 16:59:08 +1100
commit3f6fa591cb685362dc8141ab4cc54b4f9466ad99 (patch)
tree12b0cfed781ea70eee2e00f42b4e96952ccac90a
parentbd8bd09411c8c4989212b49a5bcddc6e26ca65cb (diff)
downloadgstreamer-plugins-bad-3f6fa591cb685362dc8141ab4cc54b4f9466ad99.tar.gz
gtk: add the overlaycomposition feature to the template caps
There is a possibility that the _get_caps impl will be called with the feature in the filter caps which when interecting with the template, will return EMPTY and therefore fail negotiation. https://bugzilla.gnome.org/show_bug.cgi?id=757854
-rw-r--r--ext/gtk/gstgtkglsink.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/gtk/gstgtkglsink.c b/ext/gtk/gstgtkglsink.c
index ceba7bda1..4d41f1a20 100644
--- a/ext/gtk/gstgtkglsink.c
+++ b/ext/gtk/gstgtkglsink.c
@@ -42,11 +42,14 @@ static GstCaps *gst_gtk_gl_sink_get_caps (GstBaseSink * bsink,
GstCaps * filter);
static GstStaticPadTemplate gst_gtk_gl_sink_template =
-GST_STATIC_PAD_TEMPLATE ("sink",
+ GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES
- (GST_CAPS_FEATURE_MEMORY_GL_MEMORY, "RGBA")));
+ (GST_CAPS_FEATURE_MEMORY_GL_MEMORY, "RGBA") "; "
+ GST_VIDEO_CAPS_MAKE_WITH_FEATURES
+ (GST_CAPS_FEATURE_MEMORY_GL_MEMORY ", "
+ GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION, "RGBA")));
#define gst_gtk_gl_sink_parent_class parent_class
G_DEFINE_TYPE_WITH_CODE (GstGtkGLSink, gst_gtk_gl_sink,