mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-18 07:47:17 +00:00
interleave: fix indenting and upgrade two debugs to warnings.
Fix newlines in variable decls. Change two debugs to become warnings as they indicate that things will not work.
This commit is contained in:
parent
11c93fc1df
commit
8990398733
1 changed files with 2 additions and 9 deletions
|
@ -841,14 +841,14 @@ gst_interleave_sink_setcaps (GstPad * pad, GstCaps * caps)
|
||||||
|
|
||||||
cannot_change_caps:
|
cannot_change_caps:
|
||||||
{
|
{
|
||||||
GST_DEBUG_OBJECT (self, "caps of %" GST_PTR_FORMAT " already set, can't "
|
GST_WARNING_OBJECT (self, "caps of %" GST_PTR_FORMAT " already set, can't "
|
||||||
"change", self->sinkcaps);
|
"change", self->sinkcaps);
|
||||||
gst_object_unref (self);
|
gst_object_unref (self);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
src_did_not_accept:
|
src_did_not_accept:
|
||||||
{
|
{
|
||||||
GST_DEBUG_OBJECT (self, "src did not accept setcaps()");
|
GST_WARNING_OBJECT (self, "src did not accept setcaps()");
|
||||||
gst_object_unref (self);
|
gst_object_unref (self);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
@ -1226,19 +1226,12 @@ static GstFlowReturn
|
||||||
gst_interleave_collected (GstCollectPads * pads, GstInterleave * self)
|
gst_interleave_collected (GstCollectPads * pads, GstInterleave * self)
|
||||||
{
|
{
|
||||||
guint size;
|
guint size;
|
||||||
|
|
||||||
GstBuffer *outbuf;
|
GstBuffer *outbuf;
|
||||||
|
|
||||||
GstFlowReturn ret = GST_FLOW_OK;
|
GstFlowReturn ret = GST_FLOW_OK;
|
||||||
|
|
||||||
GSList *collected;
|
GSList *collected;
|
||||||
|
|
||||||
guint nsamples;
|
guint nsamples;
|
||||||
|
|
||||||
guint ncollected = 0;
|
guint ncollected = 0;
|
||||||
|
|
||||||
gboolean empty = TRUE;
|
gboolean empty = TRUE;
|
||||||
|
|
||||||
gint width = self->width / 8;
|
gint width = self->width / 8;
|
||||||
|
|
||||||
g_return_val_if_fail (self->func != NULL, GST_FLOW_NOT_NEGOTIATED);
|
g_return_val_if_fail (self->func != NULL, GST_FLOW_NOT_NEGOTIATED);
|
||||||
|
|
Loading…
Reference in a new issue