summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--ext/faac/gstfaac.c9
-rw-r--r--ext/faad/gstfaad.c4
-rw-r--r--ext/hermes/gsthermescolorspace.c3
-rw-r--r--ext/lcs/gstcolorspace.c4
-rw-r--r--ext/xine/xineinput.c2
-rw-r--r--gst/colorspace/gstcolorspace.c3
-rw-r--r--gst/speed/gstspeed.c2
-rw-r--r--gst/videocrop/gstvideocrop.c5
9 files changed, 32 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 45c69f2c..5e866c16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-12-05 Andy Wingo <wingo@pobox.com>
+
+ * ext/faac/gstfaac.c: (gst_faac_sink_event), (gst_faac_chain):
+ * ext/faad/gstfaad.c: (gst_faad_chain):
+ * ext/hermes/gsthermescolorspace.c: (gst_hermes_colorspace_chain):
+ * ext/lcs/gstcolorspace.c: (gst_colorspace_chain):
+ * ext/xine/xineinput.c: (gst_xine_input_get):
+ * gst/colorspace/gstcolorspace.c: (gst_colorspace_chain):
+ * gst/speed/gstspeed.c: (speed_chain):
+ * gst/videocrop/gstvideocrop.c: (gst_video_crop_chain): Update for
+ alloc_buffer changes.
+
2005-12-02 Tim-Philipp Müller <tim at centricular dot net>
* ext/Makefile.am:
diff --git a/ext/faac/gstfaac.c b/ext/faac/gstfaac.c
index f89ad751..efae2462 100644
--- a/ext/faac/gstfaac.c
+++ b/ext/faac/gstfaac.c
@@ -434,9 +434,9 @@ gst_faac_sink_event (GstPad * pad, GstEvent * event)
/* flush first */
ret = TRUE;
do {
- if (gst_pad_alloc_buffer (faac->srcpad, GST_BUFFER_OFFSET_NONE,
- faac->bytes, GST_PAD_CAPS (faac->srcpad),
- &outbuf) == GST_FLOW_OK) {
+ if (gst_pad_alloc_buffer_and_set_caps (faac->srcpad,
+ GST_BUFFER_OFFSET_NONE, faac->bytes,
+ GST_PAD_CAPS (faac->srcpad), &outbuf) == GST_FLOW_OK) {
gint ret_size;
if ((ret_size = faacEncEncode (faac->handle, NULL, 0,
@@ -556,7 +556,8 @@ gst_faac_chain (GstPad * pad, GstBuffer * inbuf)
(size - in_size) / size);
}
- result = gst_pad_alloc_buffer (faac->srcpad, GST_BUFFER_OFFSET_NONE,
+ result =
+ gst_pad_alloc_buffer_and_set_caps (faac->srcpad, GST_BUFFER_OFFSET_NONE,
faac->bytes, GST_PAD_CAPS (faac->srcpad), &outbuf);
if (result != GST_FLOW_OK)
goto done;
diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c
index 6057469c..299e7d19 100644
--- a/ext/faad/gstfaad.c
+++ b/ext/faad/gstfaad.c
@@ -867,7 +867,9 @@ gst_faad_chain (GstPad * pad, GstBuffer * buffer)
guint num_samples = info.samples / faad->channels;
/* note: info.samples is total samples, not per channel */
- ret = gst_pad_alloc_buffer (faad->srcpad, 0, bufsize, caps, &outbuf);
+ ret =
+ gst_pad_alloc_buffer_and_set_caps (faad->srcpad, 0, bufsize, caps,
+ &outbuf);
if (ret != GST_FLOW_OK)
goto out;
diff --git a/ext/hermes/gsthermescolorspace.c b/ext/hermes/gsthermescolorspace.c
index 85de2e4b..36d32f19 100644
--- a/ext/hermes/gsthermescolorspace.c
+++ b/ext/hermes/gsthermescolorspace.c
@@ -580,7 +580,8 @@ gst_hermes_colorspace_chain (GstPad * pad, GstData * _data)
g_critical ("input size is smaller than expected");
}
- outbuf = gst_pad_alloc_buffer (space->srcpad, GST_BUFFER_OFFSET_NONE,
+ outbuf =
+ gst_pad_alloc_buffer_and_set_caps (space->srcpad, GST_BUFFER_OFFSET_NONE,
space->src_size);
Hermes_ConverterCopy (space->h_handle,
diff --git a/ext/lcs/gstcolorspace.c b/ext/lcs/gstcolorspace.c
index ab1167a4..5e688b7b 100644
--- a/ext/lcs/gstcolorspace.c
+++ b/ext/lcs/gstcolorspace.c
@@ -411,7 +411,9 @@ gst_colorspace_chain (GstPad * pad, GstData * _data)
lcs_format_buffer_size (lcs_converter_get_dest_format (space->converter),
space->width, space->height, &size);
- outbuf = gst_pad_alloc_buffer (space->srcpad, GST_BUFFER_OFFSET_NONE, size);
+ outbuf =
+ gst_pad_alloc_buffer_and_set_caps (space->srcpad,
+ GST_BUFFER_OFFSET_NONE, size);
lcs_convert_auto (space->converter,
GST_BUFFER_DATA (buf),
diff --git a/ext/xine/xineinput.c b/ext/xine/xineinput.c
index bdc84195..fb4813ac 100644
--- a/ext/xine/xineinput.c
+++ b/ext/xine/xineinput.c
@@ -168,7 +168,7 @@ gst_xine_input_get (GstPad * pad)
}
buf =
- gst_pad_alloc_buffer (xine->srcpad, GST_BUFFER_OFFSET_NONE,
+ gst_pad_alloc_buffer_and_set_caps (xine->srcpad, GST_BUFFER_OFFSET_NONE,
xine->blocksize);
GST_BUFFER_OFFSET (buf) = position;
real_size =
diff --git a/gst/colorspace/gstcolorspace.c b/gst/colorspace/gstcolorspace.c
index 5f2d2726..68de0435 100644
--- a/gst/colorspace/gstcolorspace.c
+++ b/gst/colorspace/gstcolorspace.c
@@ -551,7 +551,8 @@ gst_colorspace_chain (GstPad * pad, GstData * _data)
g_critical ("input size is smaller than expected");
}
- outbuf = gst_pad_alloc_buffer (space->srcpad, GST_BUFFER_OFFSET_NONE,
+ outbuf =
+ gst_pad_alloc_buffer_and_set_caps (space->srcpad, GST_BUFFER_OFFSET_NONE,
space->src_size);
converter = gst_colorspace_converters + space->converter_index;
diff --git a/gst/speed/gstspeed.c b/gst/speed/gstspeed.c
index fb04f35e..4e11891a 100644
--- a/gst/speed/gstspeed.c
+++ b/gst/speed/gstspeed.c
@@ -686,7 +686,7 @@ speed_chain (GstPad * pad, GstBuffer * in_buf)
filter->sample_size;
result =
- gst_pad_alloc_buffer (filter->srcpad, -1, out_size,
+ gst_pad_alloc_buffer_and_set_caps (filter->srcpad, -1, out_size,
GST_PAD_CAPS (filter->srcpad), &out_buf);
if (result != GST_FLOW_OK) {
diff --git a/gst/videocrop/gstvideocrop.c b/gst/videocrop/gstvideocrop.c
index 2af4a76c..3fc63d25 100644
--- a/gst/videocrop/gstvideocrop.c
+++ b/gst/videocrop/gstvideocrop.c
@@ -521,8 +521,9 @@ gst_video_crop_chain (GstPad * pad, GstData * _data)
g_return_if_fail (GST_BUFFER_SIZE (buffer) >=
GST_VIDEO_I420_SIZE (video_crop->width, video_crop->height));
- outbuf = gst_pad_alloc_buffer (video_crop->srcpad, GST_BUFFER_OFFSET (buffer),
- GST_VIDEO_I420_SIZE (new_width, new_height));
+ outbuf =
+ gst_pad_alloc_buffer_and_set_caps (video_crop->srcpad,
+ GST_BUFFER_OFFSET (buffer), GST_VIDEO_I420_SIZE (new_width, new_height));
gst_buffer_stamp (outbuf, buffer);