mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

track-video-transition: update for videomixer pad template name change

Browse source
This commit is contained in:
Tim-Philipp Müller 2012-05-01 19:06:20 +01:00
parent f7a26c704e
commit efeb450be8
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ges/ges-track-video-transition.c
View file

@ -232,10 +232,7 @@ ges_track_video_transition_create_element (GESTrackObject * object)
gst_bin_add_many (GST_BIN (topbin), iconva, iconvb, scalea, scaleb, capsfilt, gst_bin_add_many (GST_BIN (topbin), iconva, iconvb, scalea, scaleb, capsfilt,
oconv, NULL); oconv, NULL);
/* Prefer videomixer2 to videomixer */ mixer = gst_element_factory_make ("videomixer", NULL);
mixer = gst_element_factory_make ("videomixer2", NULL);
if (mixer == NULL)
mixer = gst_element_factory_make ("videomixer", NULL);
g_assert (mixer); g_assert (mixer);
g_object_set (G_OBJECT (mixer), "background", 1, NULL); g_object_set (G_OBJECT (mixer), "background", 1, NULL);
gst_bin_add (GST_BIN (topbin), mixer); gst_bin_add (GST_BIN (topbin), mixer);
@ -310,7 +307,7 @@ ges_track_video_transition_create_element (GESTrackObject * object)
static GObject * static GObject *
link_element_to_mixer (GstElement * element, GstElement * mixer) link_element_to_mixer (GstElement * element, GstElement * mixer)
{ {
GstPad *sinkpad = gst_element_get_request_pad (mixer, "sink_%d"); GstPad *sinkpad = gst_element_get_request_pad (mixer, "sink_%u");
GstPad *srcpad = gst_element_get_static_pad (element, "src"); GstPad *srcpad = gst_element_get_static_pad (element, "src");
gst_pad_link_full (srcpad, sinkpad, GST_PAD_LINK_CHECK_NOTHING); gst_pad_link_full (srcpad, sinkpad, GST_PAD_LINK_CHECK_NOTHING);
@ -338,7 +335,7 @@ link_element_to_mixer_with_smpte (GstBin * bin, GstElement * element,
} }
srcpad = gst_element_get_static_pad (smptealpha, "src"); srcpad = gst_element_get_static_pad (smptealpha, "src");
sinkpad = gst_element_get_request_pad (mixer, "sink_%d"); sinkpad = gst_element_get_request_pad (mixer, "sink_%u");
gst_pad_link_full (srcpad, sinkpad, GST_PAD_LINK_CHECK_NOTHING); gst_pad_link_full (srcpad, sinkpad, GST_PAD_LINK_CHECK_NOTHING);
gst_object_unref (srcpad); gst_object_unref (srcpad);