From: Tim-Philipp Müller Date: Tue, 22 Aug 2006 12:10:32 +0000 (+0000) Subject: gst/monoscope/gstmonoscope.c: Don't unref buffers of which we've already given away... X-Git-Tag: 1.19.3~509^2~12522 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=76ff577a41980357d999369bdce816df4c0f9152;p=platform%2Fupstream%2Fgstreamer.git gst/monoscope/gstmonoscope.c: Don't unref buffers of which we've already given away ownership to the adapter. Original commit message from CVS: * gst/monoscope/gstmonoscope.c: (gst_monoscope_chain): Don't unref buffers of which we've already given away ownership to the adapter. --- diff --git a/ChangeLog b/ChangeLog index e8f3f1f..c56b80d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2006-08-22 Tim-Philipp Müller + * gst/monoscope/gstmonoscope.c: (gst_monoscope_chain): + Don't unref buffers of which we've already given away + ownership to the adapter. + +2006-08-22 Tim-Philipp Müller + * ext/speex/gstspeexdec.c: (speex_dec_chain_parse_comments): Make metadata extraction actually work. diff --git a/gst/monoscope/gstmonoscope.c b/gst/monoscope/gstmonoscope.c index 573b5bf..9d84cd9 100644 --- a/gst/monoscope/gstmonoscope.c +++ b/gst/monoscope/gstmonoscope.c @@ -345,10 +345,8 @@ gst_monoscope_chain (GstPad * pad, GstBuffer * inbuf) /* do negotiation if not done yet, so ->spf etc. is set */ if (GST_PAD_CAPS (monoscope->srcpad) == NULL) { flow_ret = get_buffer (monoscope, &outbuf); - if (flow_ret != GST_FLOW_OK) { - gst_buffer_unref (inbuf); + if (flow_ret != GST_FLOW_OK) goto out; - } gst_buffer_unref (outbuf); outbuf = NULL; } @@ -401,10 +399,8 @@ gst_monoscope_chain (GstPad * pad, GstBuffer * inbuf) } flow_ret = get_buffer (monoscope, &outbuf); - if (flow_ret != GST_FLOW_OK) { - gst_buffer_unref (inbuf); + if (flow_ret != GST_FLOW_OK) goto out; - } memcpy (GST_BUFFER_DATA (outbuf), pixels, monoscope->outsize);