From d19bda7e69a240d87928436b450d4c9e2980f787 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Mon, 12 Jan 2015 18:25:30 +0000 Subject: video-sink: do not advertise anything but RGBA for texture upload --- clutter-gst/clutter-gst-video-sink.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c index 85aefe8..b4f77a3 100644 --- a/clutter-gst/clutter-gst-video-sink.c +++ b/clutter-gst/clutter-gst-video-sink.c @@ -106,16 +106,19 @@ GST_DEBUG_CATEGORY_STATIC (clutter_gst_video_sink_debug); #define MAKE_CAPS(feature, caps) \ - GST_VIDEO_CAPS_MAKE_WITH_FEATURES(feature "," GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION, caps) \ - ";" \ GST_VIDEO_CAPS_MAKE_WITH_FEATURES(feature, caps) +#define MAKE_CAPS_COMPOSITON(feature, caps) \ + GST_VIDEO_CAPS_MAKE_WITH_FEATURES(feature "," GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION, caps) + static const char clutter_gst_video_sink_caps_str[] = MAKE_CAPS (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY, BASE_SINK_CAPS) #ifdef HAVE_GL_TEXTURE_UPLOAD ";" - MAKE_CAPS (GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META, BASE_SINK_CAPS) + MAKE_CAPS (GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META, "{ RGBA }") #endif + ";" + MAKE_CAPS_COMPOSITON (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY, BASE_SINK_CAPS) ; -- cgit v1.2.1