update for buffer changes

diff --git a/gst/asfdemux/asfpacket.c b/gst/asfdemux/asfpacket.c
index 16b6050..2beaa06 100644 (file)
--- 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 aa8e200..6985fc6 100644 (file)
--- 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 1c1adfd..69135ce 100644 (file)
--- 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;
   }