diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2005-02-11 16:38:14 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2005-02-11 16:38:14 +0000 |
| commit | 7565ce2d0df937391a4b340bf7c22e47928adf04 (patch) | |
| tree | 4f37f4c97fe4e543e3accb47030cab4467694a53 | |
| parent | 4a1a8872625b855d6bf909e1c493625c1ee78c00 (diff) | |
| download | gstreamer-plugins-bad-7565ce2d0df937391a4b340bf7c22e47928adf04.tar.gz | |
remove buffer_join
Original commit message from CVS:
remove buffer_join
| -rw-r--r-- | ext/faad/gstfaad.c | 7 | ||||
| -rw-r--r-- | gst/cdxaparse/gstcdxastrip.c | 9 | ||||
| -rw-r--r-- | gst/cdxaparse/gstvcdparse.c | 9 |
3 files changed, 20 insertions, 5 deletions
diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c index c5b900cff..6fc19d98b 100644 --- a/ext/faad/gstfaad.c +++ b/ext/faad/gstfaad.c @@ -571,8 +571,13 @@ gst_faad_chain (GstPad * pad, GstData * data) buf = GST_BUFFER (data); next_ts = GST_BUFFER_TIMESTAMP (buf); if (faad->tempbuf) { - buf = gst_buffer_join (faad->tempbuf, buf); + GstBuffer *new = NULL; + + new = gst_buffer_join (faad->tempbuf, buf); + gst_buffer_unref (faad->tempbuf); faad->tempbuf = NULL; + gst_buffer_unref (buf); + buf = new; } /* init if not already done during capsnego */ diff --git a/gst/cdxaparse/gstcdxastrip.c b/gst/cdxaparse/gstcdxastrip.c index 312c30281..240f971f0 100644 --- a/gst/cdxaparse/gstcdxastrip.c +++ b/gst/cdxaparse/gstcdxastrip.c @@ -353,9 +353,14 @@ gst_cdxastrip_chain (GstPad * pad, GstData * data) buf = GST_BUFFER (data); if (cdxa->cache) { - buf = gst_buffer_join (cdxa->cache, buf); + GstBuffer *new = NULL; + + new = gst_buffer_join (cdxa->cache, buf); + gst_buffer_unref (cdxa->cache); + cdxa->cache = NULL; + gst_buffer_unref (buf); + buf = new; } - cdxa->cache = NULL; while (buf && GST_BUFFER_SIZE (buf) >= GST_CDXA_SECTOR_SIZE) { /* sync */ diff --git a/gst/cdxaparse/gstvcdparse.c b/gst/cdxaparse/gstvcdparse.c index 312c30281..240f971f0 100644 --- a/gst/cdxaparse/gstvcdparse.c +++ b/gst/cdxaparse/gstvcdparse.c @@ -353,9 +353,14 @@ gst_cdxastrip_chain (GstPad * pad, GstData * data) buf = GST_BUFFER (data); if (cdxa->cache) { - buf = gst_buffer_join (cdxa->cache, buf); + GstBuffer *new = NULL; + + new = gst_buffer_join (cdxa->cache, buf); + gst_buffer_unref (cdxa->cache); + cdxa->cache = NULL; + gst_buffer_unref (buf); + buf = new; } - cdxa->cache = NULL; while (buf && GST_BUFFER_SIZE (buf) >= GST_CDXA_SECTOR_SIZE) { /* sync */ |