summaryrefslogtreecommitdiff
path: root/ext/gtk
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 15:40:25 +1100
commiteb4e2de4e87d9029416ae919a5a392f912026df6 (patch)
treee66b23191a69f2097ed19b867e40758f555fd366 /ext/gtk
parent75ad1246a204b6e4e43cf41e9b7e65f5b0f64ea3 (diff)
downloadgstreamer-plugins-bad-eb4e2de4e87d9029416ae919a5a392f912026df6.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
Diffstat (limited to 'ext/gtk')
-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,