summaryrefslogtreecommitdiffstats
path: root/gst/mpeg1videoparse
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2002-07-08 19:42:06 +0000
committerWim Taymans <wim.taymans@gmail.com>2002-07-08 19:42:06 +0000
commit47043705b307a9a7d239252d732210d1af45af7b (patch)
tree6b92de5c305d47dfd1417df8f50d11e7aa9f95be /gst/mpeg1videoparse
parentfe3270c356f6b95895f94694317cfa332ab68642 (diff)
downloadgst-plugins-bad-47043705b307a9a7d239252d732210d1af45af7b.tar.gz
gst-plugins-bad-47043705b307a9a7d239252d732210d1af45af7b.tar.bz2
gst-plugins-bad-47043705b307a9a7d239252d732210d1af45af7b.zip
- use _merge instead of _append
Original commit message from CVS: - use _merge instead of _append - fix events in modplug
Diffstat (limited to 'gst/mpeg1videoparse')
-rw-r--r--gst/mpeg1videoparse/gstmp1videoparse.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/gst/mpeg1videoparse/gstmp1videoparse.c b/gst/mpeg1videoparse/gstmp1videoparse.c
index 74efd0d9..94263dea 100644
--- a/gst/mpeg1videoparse/gstmp1videoparse.c
+++ b/gst/mpeg1videoparse/gstmp1videoparse.c
@@ -257,9 +257,15 @@ gst_mp1videoparse_real_chain (Mp1VideoParse *mp1videoparse, GstBuffer *buf, GstP
if (mp1videoparse->partialbuf) {
+ GstBuffer *merge;
+
offset = GST_BUFFER_SIZE(mp1videoparse->partialbuf);
- mp1videoparse->partialbuf = gst_buffer_append(mp1videoparse->partialbuf, buf);
+ merge = gst_buffer_merge(mp1videoparse->partialbuf, buf);
+
+ gst_buffer_unref(mp1videoparse->partialbuf);
gst_buffer_unref(buf);
+
+ mp1videoparse->partialbuf = merge;
}
else {
mp1videoparse->partialbuf = buf;