summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2008-01-04 18:47:57 +0000
committerWim Taymans <wim.taymans@gmail.com>2008-01-04 18:47:57 +0000
commitc3ccc8307148df3152d7edeeb060da65e93832de (patch)
treebc1ce7c2c5b9eb0960893af9b6dddd3293b3ca86
parent655b6b81943f5e99ae688944a23af817093be545 (diff)
downloadgst-plugins-bad-c3ccc8307148df3152d7edeeb060da65e93832de.tar.gz
gst-plugins-bad-c3ccc8307148df3152d7edeeb060da65e93832de.tar.bz2
gst-plugins-bad-c3ccc8307148df3152d7edeeb060da65e93832de.zip
gst/rtpmanager/gstrtpjitterbuffer.c: Don't unref the popped buffer when we don't have ownership.
Original commit message from CVS: * gst/rtpmanager/gstrtpjitterbuffer.c: (gst_rtp_jitter_buffer_loop): Don't unref the popped buffer when we don't have ownership. Fixes #507020.
-rw-r--r--ChangeLog7
-rw-r--r--gst/rtpmanager/gstrtpjitterbuffer.c4
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e72c073..290cfc37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-04 Wim Taymans <wim.taymans@collabora.co.uk>
+
+ * gst/rtpmanager/gstrtpjitterbuffer.c:
+ (gst_rtp_jitter_buffer_loop):
+ Don't unref the popped buffer when we don't have ownership.
+ Fixes #507020.
+
2008-01-03 Zaheer Abbas Merali <zaheerabbas at merali dot org>
* gst/mpegtsparse/Makefile.am:
diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c
index 76226229..64acc4ba 100644
--- a/gst/rtpmanager/gstrtpjitterbuffer.c
+++ b/gst/rtpmanager/gstrtpjitterbuffer.c
@@ -971,7 +971,7 @@ static void
gst_rtp_jitter_buffer_loop (GstRtpJitterBuffer * jitterbuffer)
{
GstRtpJitterBufferPrivate *priv;
- GstBuffer *outbuf = NULL;
+ GstBuffer *outbuf;
GstFlowReturn result;
guint16 seqnum;
GstClockTime timestamp, out_time;
@@ -1152,8 +1152,6 @@ flushing:
{
GST_DEBUG_OBJECT (jitterbuffer, "we are flushing");
gst_pad_pause_task (priv->srcpad);
- if (outbuf)
- gst_buffer_unref (outbuf);
JBUF_UNLOCK (priv);
return;
}