diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/ladspa/gstsignalprocessor.c | 10 |
2 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,10 @@ +2006-08-16 Wim Taymans <wim@fluendo.com> + + * ext/ladspa/gstsignalprocessor.c: (gst_signal_processor_flush), + (gst_signal_processor_do_pushes): + A push() gives away our refcount so we should not use the buffer on the + pen anymore. + 2006-08-16 Tim-Philipp Müller <tim at centricular dot net> * sys/oss/gstossmixerelement.c: (gst_oss_mixer_element_class_init), diff --git a/ext/ladspa/gstsignalprocessor.c b/ext/ladspa/gstsignalprocessor.c index 2d835416..41fe4e1e 100644 --- a/ext/ladspa/gstsignalprocessor.c +++ b/ext/ladspa/gstsignalprocessor.c @@ -602,8 +602,6 @@ gst_signal_processor_flush (GstSignalProcessor * self) { GList *pads; - pads = GST_ELEMENT (self)->pads; - for (pads = GST_ELEMENT (self)->pads; pads; pads = pads->next) { GstSignalProcessorPad *spad = (GstSignalProcessorPad *) pads->data; @@ -708,6 +706,7 @@ gst_signal_processor_do_pushes (GstSignalProcessor * self) for (; srcpads; srcpads = srcpads->next) { GstSignalProcessorPad *spad = (GstSignalProcessorPad *) srcpads->data; GstFlowReturn ret = GST_FLOW_OK; + GstBuffer *buffer; if (!spad->pen) { g_warning ("Unexpectedly empty buffer pen for pad %s:%s", @@ -715,14 +714,17 @@ gst_signal_processor_do_pushes (GstSignalProcessor * self) continue; } - ret = gst_pad_push (GST_PAD (spad), spad->pen); + /* take buffer from pen */ + buffer = spad->pen; + spad->pen = NULL; + + ret = gst_pad_push (GST_PAD (spad), buffer); if (ret != GST_FLOW_OK) { self->flow_state = ret; gst_signal_processor_flush (self); return; } else { - spad->pen = NULL; g_assert (self->pending_out > 0); self->pending_out--; } |