mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-04 13:45:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch '0.11' of ssh://git.freedesktop.org/git/gstreamer/gstreamer into 0.11

Browse source
This commit is contained in:
Sebastian Dröge 2011-05-16 16:54:02 +02:00
parent b935a814d9 bd1c4506b8
commit c079b5fd42
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docs/manual/advanced-autoplugging.xml
View file

@ -344,7 +344,7 @@ cb_newpad (GstElement *element,
{
GstCaps *caps;
caps = gst_pad_get_caps (pad);
caps = gst_pad_get_caps (pad, NULL);
try_to_plug (pad, caps);
gst_caps_unref (caps);
}
@ -389,7 +389,7 @@ close_link (GstPad *srcpad,
switch (templ->presence) {
case GST_PAD_ALWAYS: {
GstPad *pad = gst_element_get_static_pad (sinkelement, templ->name_template);
GstCaps *caps = gst_pad_get_caps (pad);
GstCaps *caps = gst_pad_get_caps (pad, NULL);
/* link */
try_to_plug (pad, caps);
@ -436,7 +436,8 @@ try_to_plug (GstPad *pad,
}
/* can it link to the audiopad? */
audiocaps = gst_pad_get_caps (gst_element_get_static_pad (audiosink, "sink"));
audiocaps = gst_pad_get_caps (gst_element_get_static_pad (audiosink, "sink"),
NULL);
res = gst_caps_intersect (caps, audiocaps);
if (res && !gst_caps_is_empty (res)) {
g_print ("Found pad to link to audiosink - plugging is now done\n");

2
docs/manual/highlevel-components.xml
View file

@ -253,7 +253,7 @@ cb_newpad (GstElement *decodebin,
}
/* check media type */
caps = gst_pad_get_caps (pad);
caps = gst_pad_get_caps (pad, NULL);
str = gst_caps_get_structure (caps, 0);
if (!g_strrstr (gst_structure_get_name (str), "audio")) {
gst_caps_unref (caps);