mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-28 03:00:35 +00:00
Code Issues 1 Projects Releases Wiki Activity

update for buffer changes

Browse source
This commit is contained in:
Wim Taymans 2012-03-28 12:50:09 +02:00
parent 0a69cc27a6
commit ffa672bd34
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/asfdemux/asfpacket.c
View file

@ -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));

2
gst/asfdemux/gstasfdemux.c
View file

@ -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);
}
}

5
gst/dvdsub/gstdvdsubdec.c
View file

@ -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;
}