From ffa672bd3427fb3b0df00ffd8c2ff6db03bc3f92 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 28 Mar 2012 12:50:09 +0200 Subject: [PATCH] update for buffer changes --- gst/asfdemux/asfpacket.c | 2 +- gst/asfdemux/gstasfdemux.c | 2 +- gst/dvdsub/gstdvdsubdec.c | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/gst/asfdemux/asfpacket.c b/gst/asfdemux/asfpacket.c index 16b6050607..2beaa06162 100644 --- a/gst/asfdemux/asfpacket.c +++ b/gst/asfdemux/asfpacket.c @@ -396,7 +396,7 @@ gst_asf_demux_parse_payload (GstASFDemux * demux, AsfPacket * packet, GST_WARNING_OBJECT (demux, "Offset doesn't match previous data?!"); } /* note: buffer join/merge might not preserve buffer flags */ - prev->buf = gst_buffer_join (prev->buf, payload.buf); + prev->buf = gst_buffer_append (prev->buf, payload.buf); GST_LOG_OBJECT (demux, "Merged fragments, merged size: %" G_GSIZE_FORMAT, gst_buffer_get_size (prev->buf)); diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c index aa8e2006ee..6985fc6dc7 100644 --- a/gst/asfdemux/gstasfdemux.c +++ b/gst/asfdemux/gstasfdemux.c @@ -3783,7 +3783,7 @@ gst_asf_demux_descramble_buffer (GstASFDemux * demux, AsfStream * stream, if (!offset) { descrambled_buffer = sub_buffer; } else { - descrambled_buffer = gst_buffer_join (descrambled_buffer, sub_buffer); + descrambled_buffer = gst_buffer_append (descrambled_buffer, sub_buffer); } } diff --git a/gst/dvdsub/gstdvdsubdec.c b/gst/dvdsub/gstdvdsubdec.c index 1c1adfd250..69135ceed9 100644 --- a/gst/dvdsub/gstdvdsubdec.c +++ b/gst/dvdsub/gstdvdsubdec.c @@ -833,11 +833,8 @@ gst_dvd_sub_dec_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) /* deal with partial frame from previous buffer */ if (dec->partialbuf) { - GstBuffer *merge; - gst_buffer_unmap (dec->partialbuf, &dec->partialmap); - merge = gst_buffer_join (dec->partialbuf, buf); - dec->partialbuf = merge; + dec->partialbuf = gst_buffer_append (dec->partialbuf, buf); } else { dec->partialbuf = buf; }