projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
894be47
)
update for buffer changes
author
Wim Taymans
<wim.taymans@collabora.co.uk>
Wed, 28 Mar 2012 10:50:19 +0000
(12:50 +0200)
committer
Wim Taymans
<wim.taymans@collabora.co.uk>
Wed, 28 Mar 2012 10:50:19 +0000
(12:50 +0200)
ext/ffmpeg/gstffmpegdec.c
patch
|
blob
|
history
diff --git
a/ext/ffmpeg/gstffmpegdec.c
b/ext/ffmpeg/gstffmpegdec.c
index
330911a
..
e855e8b
100644
(file)
--- a/
ext/ffmpeg/gstffmpegdec.c
+++ b/
ext/ffmpeg/gstffmpegdec.c
@@
-2805,7
+2805,7
@@
gst_ffmpegdec_chain (GstPad * pad, GstObject * parent, GstBuffer * inbuf)
if (ffmpegdec->pcache) {
/* join with previous data */
GST_LOG_OBJECT (ffmpegdec, "join parse cache");
- inbuf = gst_buffer_
join
(ffmpegdec->pcache, inbuf);
+ inbuf = gst_buffer_
append
(ffmpegdec->pcache, inbuf);
/* no more cached data, we assume we can consume the complete cache */
ffmpegdec->pcache = NULL;
}