summaryrefslogtreecommitdiffstats
path: root/gst/interleave/interleave.c
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sf.net>2009-07-21 10:07:00 +0300
committerStefan Kost <ensonic@users.sf.net>2009-07-21 10:07:00 +0300
commit89903987332864891691e511b8ef56022ac85ea4 (patch)
tree948ec17dede70dc85f3d4e8509ac45ae424dc4e8 /gst/interleave/interleave.c
parent11c93fc1df47246cbdb5eeb1822dad6c3ff97f8d (diff)
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.
Diffstat (limited to 'gst/interleave/interleave.c')
-rw-r--r--gst/interleave/interleave.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/gst/interleave/interleave.c b/gst/interleave/interleave.c
index 597504e2..b730959a 100644
--- a/gst/interleave/interleave.c
+++ b/gst/interleave/interleave.c
@@ -841,14 +841,14 @@ gst_interleave_sink_setcaps (GstPad * pad, GstCaps * 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);
gst_object_unref (self);
return FALSE;
}
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);
return FALSE;
}
@@ -1226,19 +1226,12 @@ static GstFlowReturn
gst_interleave_collected (GstCollectPads * pads, GstInterleave * self)
{
guint size;
-
GstBuffer *outbuf;
-
GstFlowReturn ret = GST_FLOW_OK;
-
GSList *collected;
-
guint nsamples;
-
guint ncollected = 0;
-
gboolean empty = TRUE;
-
gint width = self->width / 8;
g_return_val_if_fail (self->func != NULL, GST_FLOW_NOT_NEGOTIATED);