From 69298c5534a96fc1f5bec8009c90322532283df1 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 28 Mar 2012 12:48:55 +0200 Subject: [PATCH] update for buffer changes --- gst-libs/gst/tag/gstexiftag.c | 2 +- gst-libs/gst/tag/gsttagdemux.c | 2 +- gst/gdp/gstgdppay.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gst-libs/gst/tag/gstexiftag.c b/gst-libs/gst/tag/gstexiftag.c index 6cc37ea..d952744 100644 --- a/gst-libs/gst/tag/gstexiftag.c +++ b/gst-libs/gst/tag/gstexiftag.c @@ -550,7 +550,7 @@ gst_exif_writer_reset_and_get_buffer (GstExifWriter * writer) header = gst_byte_writer_reset_and_get_buffer (&writer->tagwriter); data = gst_byte_writer_reset_and_get_buffer (&writer->datawriter); - return gst_buffer_join (header, data); + return gst_buffer_append (header, data); } /* diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c index 17f414b..f28924f 100644 --- a/gst-libs/gst/tag/gsttagdemux.c +++ b/gst-libs/gst/tag/gsttagdemux.c @@ -573,7 +573,7 @@ gst_tag_demux_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) if (demux->priv->collect == NULL) { demux->priv->collect = buf; } else { - demux->priv->collect = gst_buffer_join (demux->priv->collect, buf); + demux->priv->collect = gst_buffer_append (demux->priv->collect, buf); } demux->priv->collect_size += size; buf = NULL; diff --git a/gst/gdp/gstgdppay.c b/gst/gdp/gstgdppay.c index bb5764f..40a88b3 100644 --- a/gst/gdp/gstgdppay.c +++ b/gst/gdp/gstgdppay.c @@ -235,7 +235,7 @@ gst_gdp_buffer_from_caps (GstGDPPay * this, GstCaps * caps) gst_buffer_take_memory (payloadbuf, -1, gst_memory_new_wrapped (0, payload, plen, 0, plen, payload, g_free)); - return gst_buffer_join (headerbuf, payloadbuf); + return gst_buffer_append (headerbuf, payloadbuf); /* ERRORS */ packet_failed: @@ -264,7 +264,7 @@ gst_gdp_pay_buffer_from_buffer (GstGDPPay * this, GstBuffer * buffer) /* we do not want to lose the ref on the incoming buffer */ gst_buffer_ref (buffer); - return gst_buffer_join (headerbuf, buffer); + return gst_buffer_append (headerbuf, buffer); /* ERRORS */ no_buffer: @@ -301,7 +301,7 @@ gst_gdp_buffer_from_event (GstGDPPay * this, GstEvent * event) gst_memory_new_wrapped (0, payload, plen, 0, plen, payload, g_free)); } - return gst_buffer_join (headerbuf, payloadbuf); + return gst_buffer_append (headerbuf, payloadbuf); /* ERRORS */ no_event: -- 2.7.4