mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-04-26 05:16:13 +00:00
[MOVED FROM BAD] another batch of connect->link fixes please let me know about issues and please refrain of making them yourself, so t...
Original commit message from CVS: another batch of connect->link fixes please let me know about issues and please refrain of making them yourself, so that I don't spend double the time resolving conflicts
This commit is contained in:
parent
a22a0d423d
commit
8fdd48d996
1 changed files with 3 additions and 3 deletions
|
@ -124,12 +124,12 @@ gst_lavencode_sinkconnect (GstPad *pad, GstCaps *caps)
|
||||||
filter = GST_LAVENCODE (gst_pad_get_parent (pad));
|
filter = GST_LAVENCODE (gst_pad_get_parent (pad));
|
||||||
|
|
||||||
if (!GST_CAPS_IS_FIXED (caps))
|
if (!GST_CAPS_IS_FIXED (caps))
|
||||||
return GST_PAD_CONNECT_DELAYED;
|
return GST_PAD_LINK_DELAYED;
|
||||||
|
|
||||||
gst_caps_get_int (caps, "width", &filter->width);
|
gst_caps_get_int (caps, "width", &filter->width);
|
||||||
gst_caps_get_int (caps, "height", &filter->height);
|
gst_caps_get_int (caps, "height", &filter->height);
|
||||||
|
|
||||||
return GST_PAD_CONNECT_OK;
|
return GST_PAD_LINK_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -139,7 +139,7 @@ gst_lavencode_init (GstLavEncode *filter)
|
||||||
GST_PAD_TEMPLATE_GET (lavencode_sink_factory), "sink");
|
GST_PAD_TEMPLATE_GET (lavencode_sink_factory), "sink");
|
||||||
gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad);
|
gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad);
|
||||||
gst_pad_set_chain_function (filter->sinkpad, gst_lavencode_chain);
|
gst_pad_set_chain_function (filter->sinkpad, gst_lavencode_chain);
|
||||||
gst_pad_set_connect_function (filter->sinkpad, gst_lavencode_sinkconnect);
|
gst_pad_set_link_function (filter->sinkpad, gst_lavencode_sinkconnect);
|
||||||
|
|
||||||
filter->srcpad = gst_pad_new_from_template(
|
filter->srcpad = gst_pad_new_from_template(
|
||||||
GST_PAD_TEMPLATE_GET (lavencode_src_factory), "src");
|
GST_PAD_TEMPLATE_GET (lavencode_src_factory), "src");
|
||||||
|
|
Loading…
Reference in a new issue