From: <tho...@ke...> - 2006-04-22 21:13:08
|
CVS Root: /cvs/gstreamer Module: gst-plugins-base Changes by: thomasvs Date: Sat Apr 22 2006 21:13:04 UTC Log message: Patch by: Jan Schmidt * gst/playback/gststreamselector.c: (gst_stream_selector_bufferalloc): Restore old StreamSelector behaviour. Fixes #338419. Modified files: . : ChangeLog gst/playback : gststreamselector.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.2557&r2=1.2558 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst/playback/gststreamselector.c.diff?r1=1.19&r2=1.20 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v retrieving revision 1.2557 retrieving revision 1.2558 diff -u -d -r1.2557 -r1.2558 --- ChangeLog 13 Apr 2006 09:26:27 -0000 1.2557 +++ ChangeLog 22 Apr 2006 21:12:51 -0000 1.2558 @@ -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> * configure.ac: Index: gststreamselector.c RCS file: /cvs/gstreamer/gst-plugins-base/gst/playback/gststreamselector.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- gststreamselector.c 11 Apr 2006 10:45:32 -0000 1.19 +++ gststreamselector.c 22 Apr 2006 21:12:52 -0000 1.20 @@ -301,13 +301,14 @@ 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); |