diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-28 12:49:54 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-28 12:53:09 +0200 |
| commit | a9ec4d62a89dd53aa295af02c7d5f57ef936359b (patch) | |
| tree | 6a11de050ed6d983485a13519738289bb9231aa1 /sys | |
| parent | 3963204e34e8a1722bdea11e36df72ec94f0afe3 (diff) | |
| download | gstreamer-plugins-bad-a9ec4d62a89dd53aa295af02c7d5f57ef936359b.tar.gz | |
update for buffer changes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/decklink/gstdecklinksink.cpp | 2 | ||||
| -rw-r--r-- | sys/dxr3/dxr3videosink.c | 6 | ||||
| -rw-r--r-- | sys/vdpau/mpeg/gstvdpmpegframe.c | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/sys/decklink/gstdecklinksink.cpp b/sys/decklink/gstdecklinksink.cpp index a09e49bf8..1f4ccc8d0 100644 --- a/sys/decklink/gstdecklinksink.cpp +++ b/sys/decklink/gstdecklinksink.cpp @@ -973,7 +973,7 @@ gst_decklink_sink_audiosink_chain (GstPad * pad, GstBuffer * buffer) // concatenate both buffers g_mutex_lock (decklinksink->audio_mutex); decklinksink->audio_buffer = - gst_buffer_join (decklinksink->audio_buffer, buffer); + gst_buffer_append (decklinksink->audio_buffer, buffer); g_mutex_unlock (decklinksink->audio_mutex); // GST_DEBUG("Audio Buffer Size: %d", GST_BUFFER_SIZE (decklinksink->audio_buffer)); diff --git a/sys/dxr3/dxr3videosink.c b/sys/dxr3/dxr3videosink.c index 1c69295ab..9ee27b4e1 100644 --- a/sys/dxr3/dxr3videosink.c +++ b/sys/dxr3/dxr3videosink.c @@ -599,7 +599,6 @@ dxr3videosink_chain (GstPad * pad, GstData * _data) { GstBuffer *buf = GST_BUFFER (_data); Dxr3VideoSink *sink; - GstBuffer *merged; g_return_if_fail (pad != NULL); g_return_if_fail (GST_IS_PAD (pad)); @@ -617,10 +616,7 @@ dxr3videosink_chain (GstPad * pad, GstData * _data) if (sink->cur_buf == NULL) { sink->cur_buf = buf; } else { - merged = gst_buffer_merge (sink->cur_buf, buf); - gst_buffer_unref (sink->cur_buf); - gst_buffer_unref (buf); - sink->cur_buf = merged; + sink->cur_buf = gst_buffer_append (sink->cur_buf, buf); } sink->last_ts = GST_BUFFER_TIMESTAMP (buf); diff --git a/sys/vdpau/mpeg/gstvdpmpegframe.c b/sys/vdpau/mpeg/gstvdpmpegframe.c index 54e1a3c28..a3e9060cf 100644 --- a/sys/vdpau/mpeg/gstvdpmpegframe.c +++ b/sys/vdpau/mpeg/gstvdpmpegframe.c @@ -36,7 +36,7 @@ gst_vdp_mpeg_frame_add_slice (GstVdpMpegFrame * mpeg_frame, GstBuffer * buf) if (!mpeg_frame->slices) mpeg_frame->slices = buf; else - mpeg_frame->slices = gst_buffer_join (mpeg_frame->slices, buf); + mpeg_frame->slices = gst_buffer_append (mpeg_frame->slices, buf); mpeg_frame->n_slices++; } |