mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-02 21:48:55 +00:00
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.
This commit is contained in:
parent
6f18aadd6b
commit
b00641404a
2 changed files with 13 additions and 3 deletions
|
@ -1,3 +1,12 @@
|
||||||
|
2006-04-22 Thomas Vander Stichele <thomas at apestaart dot org>
|
||||||
|
|
||||||
|
Patch by: Jan Schmidt
|
||||||
|
|
||||||
|
* gst/playback/gststreamselector.c:
|
||||||
|
(gst_stream_selector_bufferalloc):
|
||||||
|
Restore old StreamSelector behaviour.
|
||||||
|
Fixes #338419.
|
||||||
|
|
||||||
2006-04-12 Thomas Vander Stichele <thomas at apestaart dot org>
|
2006-04-12 Thomas Vander Stichele <thomas at apestaart dot org>
|
||||||
|
|
||||||
* configure.ac:
|
* configure.ac:
|
||||||
|
|
|
@ -301,13 +301,14 @@ gst_stream_selector_bufferalloc (GstPad * pad, guint64 offset,
|
||||||
active_sinkpad = sel->active_sinkpad;
|
active_sinkpad = sel->active_sinkpad;
|
||||||
GST_OBJECT_UNLOCK (sel);
|
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) {
|
if (pad != active_sinkpad) {
|
||||||
GST_DEBUG_OBJECT (sel,
|
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));
|
GST_DEBUG_PAD_NAME (pad));
|
||||||
|
|
||||||
result = GST_FLOW_NOT_LINKED;
|
*buf = NULL;
|
||||||
|
result = GST_FLOW_OK;
|
||||||
} else {
|
} else {
|
||||||
result = gst_pad_alloc_buffer (sel->srcpad, offset, size, caps, buf);
|
result = gst_pad_alloc_buffer (sel->srcpad, offset, size, caps, buf);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue