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

merging fixes from HEAD

Browse source 
Original commit message from CVS:
merging fixes from HEAD
This commit is contained in:
Thomas Vander Stichele 2003-01-26 11:22:41 +00:00
parent 95d5939132
commit d6ffa18bde
5 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/autoplug/gstsearchfuncs.c
View file

@ -146,7 +146,7 @@ gst_autoplug_can_match (GstElementFactory *src, GstElementFactory *dest)
if (gst_autoplug_caps_intersect (gst_pad_template_get_caps (srctemp),
gst_pad_template_get_caps (desttemp))) {
GST_DEBUG (GST_CAT_AUTOPLUG_ATTEMPT,
"factory \"%s\" can connect with factory \"%s\"\n",
"factory \"%s\" can connect with factory \"%s\"",
GST_OBJECT_NAME (src), GST_OBJECT_NAME (dest));
return desttemp;
}
@ -157,7 +157,7 @@ gst_autoplug_can_match (GstElementFactory *src, GstElementFactory *dest)
srctemps = g_list_next (srctemps);
}
GST_DEBUG (GST_CAT_AUTOPLUG_ATTEMPT,
"factory \"%s\" cannot connect with factory \"%s\"\n",
"factory \"%s\" cannot connect with factory \"%s\"",
GST_OBJECT_NAME (src), GST_OBJECT_NAME (dest));
return NULL;
}

2
gst/gstelement.c
View file

@ -2323,6 +2323,8 @@ gst_element_change_state (GstElement *element)
if (element->sched) {
if (gst_scheduler_state_transition (element->sched, element,
old_transition) != GST_STATE_SUCCESS) {
GST_DEBUG_ELEMENT (GST_CAT_STATES, element,
"scheduler could change state");
goto failure;
}
}

2
gst/gstevent.c
View file

@ -131,7 +131,7 @@ gst_event_new (GstEventType type)
event = g_new0(GstEvent, 1);
_gst_event_live++;
GST_INFO (GST_CAT_EVENT, "creating new event %p", event);
GST_INFO (GST_CAT_EVENT, "creating new event %p %d", event, type);
_GST_DATA_INIT (GST_DATA (event),
_gst_event_type,

6
tests/old/testsuite/elements/tee.c
View file

@ -126,7 +126,7 @@ main (int argc, char *argv[])
else
{
int rate;
gst_props_get (props, "rate", &rate);
gst_props_get (props, "rate", &rate, NULL);
g_print ("Rate of pad on sink1 : %d\n", rate);
}
sink_caps = gst_pad_get_caps (gst_element_get_pad (sink2, "sink"));
@ -139,7 +139,7 @@ main (int argc, char *argv[])
else
{
int rate;
gst_props_get (props, "rate", &rate);
gst_props_get (props, "rate", &rate, NULL);
g_print ("Rate of pad on sink2 : %d\n", rate);
}
@ -161,6 +161,8 @@ main (int argc, char *argv[])
/* in 0.3.2 the next statement gives an assert error */
tee_src1 = gst_element_get_request_pad (tee, "src%d");
gst_element_set_state (pipeline, GST_STATE_NULL);
g_print ("Done !\n");
return 0;
}

6
testsuite/elements/tee.c
View file

@ -126,7 +126,7 @@ main (int argc, char *argv[])
else
{
int rate;
gst_props_get (props, "rate", &rate);
gst_props_get (props, "rate", &rate, NULL);
g_print ("Rate of pad on sink1 : %d\n", rate);
}
sink_caps = gst_pad_get_caps (gst_element_get_pad (sink2, "sink"));
@ -139,7 +139,7 @@ main (int argc, char *argv[])
else
{
int rate;
gst_props_get (props, "rate", &rate);
gst_props_get (props, "rate", &rate, NULL);
g_print ("Rate of pad on sink2 : %d\n", rate);
}
@ -161,6 +161,8 @@ main (int argc, char *argv[])
/* in 0.3.2 the next statement gives an assert error */
tee_src1 = gst_element_get_request_pad (tee, "src%d");
gst_element_set_state (pipeline, GST_STATE_NULL);
g_print ("Done !\n");
return 0;
}