summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2012-03-30 18:13:08 +0200
committerWim Taymans <wim.taymans@collabora.co.uk>2012-03-30 18:15:34 +0200
commit3d61d12e03f8c661552454c351e40b1c2da95470 (patch)
tree99abc096040b3a67c43d04fa368bf503c3ce6a85 /gst
parentdf946f603fbb5486ef947feaec2c93640908f8d1 (diff)
downloadgstreamer-plugins-good-3d61d12e03f8c661552454c351e40b1c2da95470.tar.gz
update for buffer api change
Diffstat (limited to 'gst')
-rw-r--r--gst/avi/gstavimux.c2
-rw-r--r--gst/avi/gstavisubtitle.c2
-rw-r--r--gst/flv/gstflvmux.c2
-rw-r--r--gst/isomp4/atoms.c2
-rw-r--r--gst/isomp4/gstqtmux.c2
-rw-r--r--gst/isomp4/qtdemux.c2
-rw-r--r--gst/multifile/gstmultifilesink.c2
-rw-r--r--gst/multifile/gstmultifilesrc.c2
-rw-r--r--gst/rtp/gstrtpqdmdepay.c2
-rw-r--r--gst/rtp/gstrtptheoradepay.c4
-rw-r--r--gst/rtp/gstrtpvorbisdepay.c4
-rw-r--r--gst/rtsp/gstrtspsrc.c2
-rw-r--r--gst/udp/gstudpsrc.c2
-rw-r--r--gst/y4m/gsty4mencode.c4
14 files changed, 17 insertions, 17 deletions
diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index 6786d518c..68d177c26 100644
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -1557,7 +1557,7 @@ gst_avi_mux_write_index (GstAviMux * avimux)
data = (guint8 *) avimux->idx;
avimux->idx = NULL; /* will be free()'ed by gst_buffer_unref() */
- gst_buffer_take_memory (buffer, -1,
+ gst_buffer_append_memory (buffer,
gst_memory_new_wrapped (0, data, size, 0, size, data, g_free));
avimux->total_data += size + 8;
diff --git a/gst/avi/gstavisubtitle.c b/gst/avi/gstavisubtitle.c
index 5f5e1394c..f280b5a68 100644
--- a/gst/avi/gstavisubtitle.c
+++ b/gst/avi/gstavisubtitle.c
@@ -153,7 +153,7 @@ gst_avi_subtitle_extract_file (GstAviSubtitle * sub, GstBuffer * buffer,
ret = gst_buffer_new ();
slen = strlen (utf8);
- gst_buffer_take_memory (ret, -1,
+ gst_buffer_append_memory (ret,
gst_memory_new_wrapped (0, utf8, slen, 0, slen, utf8, g_free));
GST_BUFFER_OFFSET (ret) = 0;
diff --git a/gst/flv/gstflvmux.c b/gst/flv/gstflvmux.c
index 06daf917e..4aa967291 100644
--- a/gst/flv/gstflvmux.c
+++ b/gst/flv/gstflvmux.c
@@ -136,7 +136,7 @@ _gst_buffer_new_wrapped (gpointer mem, gsize size, GFreeFunc free_func)
GstBuffer *buf;
buf = gst_buffer_new ();
- gst_buffer_take_memory (buf, -1,
+ gst_buffer_append_memory (buf,
gst_memory_new_wrapped (free_func ? 0 : GST_MEMORY_FLAG_READONLY,
mem, size, 0, size, mem, free_func));
diff --git a/gst/isomp4/atoms.c b/gst/isomp4/atoms.c
index bffc17c96..68a90de5d 100644
--- a/gst/isomp4/atoms.c
+++ b/gst/isomp4/atoms.c
@@ -2907,7 +2907,7 @@ _gst_buffer_new_wrapped (gpointer mem, gsize size, GFreeFunc free_func)
GstBuffer *buf;
buf = gst_buffer_new ();
- gst_buffer_take_memory (buf, -1,
+ gst_buffer_append_memory (buf,
gst_memory_new_wrapped (free_func ? 0 : GST_MEMORY_FLAG_READONLY,
mem, size, 0, size, mem, free_func));
diff --git a/gst/isomp4/gstqtmux.c b/gst/isomp4/gstqtmux.c
index 531df7806..332ba48ea 100644
--- a/gst/isomp4/gstqtmux.c
+++ b/gst/isomp4/gstqtmux.c
@@ -1189,7 +1189,7 @@ _gst_buffer_new_take_data (guint8 * data, guint size)
GstBuffer *buf;
buf = gst_buffer_new ();
- gst_buffer_take_memory (buf, -1,
+ gst_buffer_append_memory (buf,
gst_memory_new_wrapped (0, data, size, 0, size, data, g_free));
return buf;
diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c
index 587b5bbe9..4bc41684e 100644
--- a/gst/isomp4/qtdemux.c
+++ b/gst/isomp4/qtdemux.c
@@ -548,7 +548,7 @@ _gst_buffer_new_wrapped (gpointer mem, gsize size, GFreeFunc free_func)
GstBuffer *buf;
buf = gst_buffer_new ();
- gst_buffer_take_memory (buf, -1,
+ gst_buffer_append_memory (buf,
gst_memory_new_wrapped (free_func ? 0 : GST_MEMORY_FLAG_READONLY,
mem, size, 0, size, mem, free_func));
diff --git a/gst/multifile/gstmultifilesink.c b/gst/multifile/gstmultifilesink.c
index 2ce4ad058..7cade3354 100644
--- a/gst/multifile/gstmultifilesink.c
+++ b/gst/multifile/gstmultifilesink.c
@@ -693,7 +693,7 @@ buffer_list_copy_data (GstBuffer ** buf, guint idx, gpointer data)
GstMemory *mem;
mem = gst_buffer_get_memory (*buf, i);
- gst_buffer_take_memory (dest, -1, mem);
+ gst_buffer_append_memory (dest, mem);
}
return TRUE;
diff --git a/gst/multifile/gstmultifilesrc.c b/gst/multifile/gstmultifilesrc.c
index 9e9c3377d..4006d81dc 100644
--- a/gst/multifile/gstmultifilesrc.c
+++ b/gst/multifile/gstmultifilesrc.c
@@ -386,7 +386,7 @@ gst_multi_file_src_create (GstPushSrc * src, GstBuffer ** buffer)
}
buf = gst_buffer_new ();
- gst_buffer_take_memory (buf, -1,
+ gst_buffer_append_memory (buf,
gst_memory_new_wrapped (0, data, size, 0, size, data, g_free));
GST_BUFFER_OFFSET (buf) = multifilesrc->offset;
GST_BUFFER_OFFSET_END (buf) = multifilesrc->offset + size;
diff --git a/gst/rtp/gstrtpqdmdepay.c b/gst/rtp/gstrtpqdmdepay.c
index bad239c58..e55cb3d0b 100644
--- a/gst/rtp/gstrtpqdmdepay.c
+++ b/gst/rtp/gstrtpqdmdepay.c
@@ -181,7 +181,7 @@ flush_data (GstRtpQDM2Depay * depay)
GST_MEMDUMP ("Extracted packet", data, depay->packetsize);
buf = gst_buffer_new ();
- gst_buffer_take_memory (buf, -1,
+ gst_buffer_append_memory (buf,
gst_memory_new_wrapped (0, data, depay->packetsize, 0,
depay->packetsize, data, g_free));
diff --git a/gst/rtp/gstrtptheoradepay.c b/gst/rtp/gstrtptheoradepay.c
index e86c5433e..76afa085d 100644
--- a/gst/rtp/gstrtptheoradepay.c
+++ b/gst/rtp/gstrtptheoradepay.c
@@ -328,7 +328,7 @@ gst_rtp_theora_depay_setcaps (GstRTPBaseDepayload * depayload, GstCaps * caps)
data = g_base64_decode (configuration, &size);
confbuf = gst_buffer_new ();
- gst_buffer_take_memory (confbuf, -1,
+ gst_buffer_append_memory (confbuf,
gst_memory_new_wrapped (0, data, size, 0, size, data, g_free));
if (!gst_rtp_theora_depay_parse_configuration (rtptheoradepay, confbuf))
@@ -542,7 +542,7 @@ gst_rtp_theora_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf)
/* create buffer for packet */
if (G_UNLIKELY (to_free)) {
outbuf = gst_buffer_new ();
- gst_buffer_take_memory (buf, -1,
+ gst_buffer_append_memory (buf,
gst_memory_new_wrapped (0, to_free,
(payload - to_free) + length, payload - to_free, length, to_free,
g_free));
diff --git a/gst/rtp/gstrtpvorbisdepay.c b/gst/rtp/gstrtpvorbisdepay.c
index 69064105b..daa301801 100644
--- a/gst/rtp/gstrtpvorbisdepay.c
+++ b/gst/rtp/gstrtpvorbisdepay.c
@@ -369,7 +369,7 @@ gst_rtp_vorbis_depay_setcaps (GstRTPBaseDepayload * depayload, GstCaps * caps)
data = g_base64_decode (configuration, &size);
confbuf = gst_buffer_new ();
- gst_buffer_take_memory (confbuf, -1,
+ gst_buffer_append_memory (confbuf,
gst_memory_new_wrapped (0, data, size, 0, size, data, g_free));
if (!gst_rtp_vorbis_depay_parse_configuration (rtpvorbisdepay, confbuf))
goto invalid_configuration;
@@ -593,7 +593,7 @@ gst_rtp_vorbis_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf)
/* create buffer for packet */
if (G_UNLIKELY (to_free)) {
outbuf = gst_buffer_new ();
- gst_buffer_take_memory (outbuf, -1,
+ gst_buffer_append_memory (outbuf,
gst_memory_new_wrapped (0, to_free,
(payload - to_free) + length, payload - to_free, length, to_free,
g_free));
diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index e8e58887f..9293baa1f 100644
--- a/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@ -3631,7 +3631,7 @@ gst_rtspsrc_loop_interleaved (GstRTSPSrc * src)
size -= 1;
buf = gst_buffer_new ();
- gst_buffer_take_memory (buf, -1,
+ gst_buffer_append_memory (buf,
gst_memory_new_wrapped (0, data, size, 0, size, data, g_free));
/* don't need message anymore */
diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c
index d8d142f18..063515166 100644
--- a/gst/udp/gstudpsrc.c
+++ b/gst/udp/gstudpsrc.c
@@ -462,7 +462,7 @@ no_select:
}
outbuf = gst_buffer_new ();
- gst_buffer_take_memory (outbuf, -1,
+ gst_buffer_append_memory (outbuf,
gst_memory_new_wrapped (0, pktdata, pktsize, offset, ret, pktdata,
g_free));
diff --git a/gst/y4m/gsty4mencode.c b/gst/y4m/gsty4mencode.c
index 748cf6c61..eaa2d7176 100644
--- a/gst/y4m/gsty4mencode.c
+++ b/gst/y4m/gsty4mencode.c
@@ -239,7 +239,7 @@ gst_y4m_encode_get_stream_header (GstY4mEncode * filter, gboolean tff)
len = strlen (header);
buf = gst_buffer_new ();
- gst_buffer_take_memory (buf, -1,
+ gst_buffer_append_memory (buf,
gst_memory_new_wrapped (0, header, len, 0, len, header, g_free));
return buf;
@@ -256,7 +256,7 @@ gst_y4m_encode_get_frame_header (GstY4mEncode * filter)
len = strlen (header);
buf = gst_buffer_new ();
- gst_buffer_take_memory (buf, -1,
+ gst_buffer_append_memory (buf,
gst_memory_new_wrapped (0, header, len, 0, len, header, g_free));
return buf;