From cb7ac0a37b710531d184ba932af79be5882f73cc Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Wed, 12 Jan 2011 21:20:08 +1300 Subject: [PATCH] make gst caps actually work (though gtk-app still crashes) --- gtk-app.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/gtk-app.c b/gtk-app.c index ff69a1b..e53cca9 100644 --- a/gtk-app.c +++ b/gtk-app.c @@ -42,17 +42,15 @@ pre_tee_pipeline(GstPipeline *pipeline, int width, int height){ char * src_name = (option_fake) ? "videotestsrc" : "v4l2src"; GstElement *src = gst_element_factory_make(src_name, NULL); GstElement *tee = gst_element_factory_make ("tee", NULL); - GstCaps *caps = gst_caps_new_any(); - - GValue gw = {0}; - GValue gh = {0}; - g_value_init(&gw, G_TYPE_INT); - g_value_init(&gh, G_TYPE_INT); - g_value_set_int(&gw, width); - g_value_set_int(&gh, height); - - gst_caps_set_value(caps, "width", &gw); - gst_caps_set_value(caps, "height", &gh); + GstCaps *caps; + caps = gst_caps_new_simple("video/x-raw-rgb", + "width", G_TYPE_INT, width, + "height", G_TYPE_INT, height, + NULL); + gst_caps_merge(caps, gst_caps_new_simple("video/x-raw-yuv", + "width", G_TYPE_INT, width, + "height", G_TYPE_INT, height, + NULL)); gst_bin_add_many(GST_BIN(pipeline), src, -- 2.11.4.GIT