summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--gst/switch/gstswitch.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f58e0d1b..1c160ca5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-12-17 Andy Wingo <wingo@pobox.com>
+ * gst/switch/gstswitch.c (gst_selector_pad_chain): Return OK when
+ a buffer is ignored, not NOT_LINKED. No sense in making a source
+ element error out; at least fdsrc considers NOT_LINKED to be a
+ fatal error. Patch 11/12. There is no patch 12/12. Foo.
+
* gst/switch/gstswitch-marshal.list:
* gst/switch/gstswitch.h (struct _GstStreamSelectorClass):
* gst/switch/gstswitch.c (gst_stream_selector_class_init)
diff --git a/gst/switch/gstswitch.c b/gst/switch/gstswitch.c
index 7b44801b..5e2e4462 100644
--- a/gst/switch/gstswitch.c
+++ b/gst/switch/gstswitch.c
@@ -425,7 +425,7 @@ ignore:
GST_DEBUG_OBJECT (sel, "Ignoring buffer %p from pad %s:%s",
buf, GST_DEBUG_PAD_NAME (pad));
gst_buffer_unref (buf);
- res = GST_FLOW_NOT_LINKED;
+ res = GST_FLOW_OK;
goto done;
}
}