From b00641404aaa6b4f73d3d3fe8f78fdedeebeb4c4 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Sat, 22 Apr 2006 21:12:52 +0000 Subject: [PATCH] gst/playback/gststreamselector.c: Restore old StreamSelector behaviour. Original commit message from CVS: Patch by: Jan Schmidt * gst/playback/gststreamselector.c: (gst_stream_selector_bufferalloc): Restore old StreamSelector behaviour. Fixes #338419. --- ChangeLog | 9 +++++++++ gst/playback/gststreamselector.c | 7 ++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a624987..ee6789b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-04-22 Thomas Vander Stichele + + Patch by: Jan Schmidt + + * gst/playback/gststreamselector.c: + (gst_stream_selector_bufferalloc): + Restore old StreamSelector behaviour. + Fixes #338419. + 2006-04-12 Thomas Vander Stichele * configure.ac: diff --git a/gst/playback/gststreamselector.c b/gst/playback/gststreamselector.c index c68245f..672964f 100644 --- a/gst/playback/gststreamselector.c +++ b/gst/playback/gststreamselector.c @@ -301,13 +301,14 @@ gst_stream_selector_bufferalloc (GstPad * pad, guint64 offset, active_sinkpad = sel->active_sinkpad; GST_OBJECT_UNLOCK (sel); - /* Ignore buffers from pads except the selected one */ + /* Fallback allocation for buffers from pads except the selected one */ if (pad != active_sinkpad) { GST_DEBUG_OBJECT (sel, - "Returning not-linked for buffer alloc from pad %s:%s", + "Pad %s:%s is not selected. Performing fallback allocation", GST_DEBUG_PAD_NAME (pad)); - result = GST_FLOW_NOT_LINKED; + *buf = NULL; + result = GST_FLOW_OK; } else { result = gst_pad_alloc_buffer (sel->srcpad, offset, size, caps, buf); -- 2.7.4