diff options
| author | Andy Wingo <wingo@pobox.com> | 2005-12-05 13:03:00 +0000 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2005-12-05 13:03:00 +0000 |
| commit | 7fbfd29bbe207f93ce17bf52ba1bc46c78cf25d2 (patch) | |
| tree | 2ae397d84724ef6c0646fa4b5def509ba17252fa /gst/multipart | |
| parent | c28031af5a9306abf320f5b6cf57d4233e137e3c (diff) | |
Update for alloc_buffer changes.
Original commit message from CVS:
2005-12-05 Andy Wingo <wingo@pobox.com>
* ext/dv/gstdvdec.c: (gst_dvdec_chain):
* ext/flac/gstflacdec.c: (gst_flacdec_write):
* ext/flac/gstflacenc.c: (gst_flacenc_write_callback):
* ext/gdk_pixbuf/gstgdkpixbuf.c: (gst_gdk_pixbuf_chain):
* ext/gdk_pixbuf/pixbufscale.c: (gst_pixbufscale_chain):
* ext/jpeg/gstjpegdec.c: (gst_jpeg_dec_chain):
* ext/jpeg/gstjpegenc.c: (gst_jpegenc_chain):
* ext/ladspa/gstsignalprocessor.c: (gst_signal_processor_process):
* ext/libpng/gstpngdec.c: (user_info_callback), (gst_pngdec_task):
* ext/speex/gstspeexdec.c: (speex_dec_chain):
* ext/speex/gstspeexenc.c: (gst_speexenc_chain):
* gst/auparse/gstauparse.c: (gst_auparse_chain):
* gst/flx/gstflxdec.c: (gst_flxdec_chain):
* gst/goom/gstgoom.c: (gst_goom_chain):
* gst/matroska/matroska-demux.c:
(gst_matroska_demux_push_vorbis_codec_priv_data),
(gst_matroska_demux_add_wvpk_header):
* gst/multipart/multipartdemux.c: (gst_multipart_demux_chain):
* gst/multipart/multipartmux.c: (gst_multipart_mux_collected):
* gst/videomixer/videomixer.c: (gst_videomixer_collected):
* gst/wavenc/gstwavenc.c: (gst_wavenc_chain): Update for
alloc_buffer changes.
Diffstat (limited to 'gst/multipart')
| -rw-r--r-- | gst/multipart/multipartdemux.c | 6 | ||||
| -rw-r--r-- | gst/multipart/multipartmux.c | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/gst/multipart/multipartdemux.c b/gst/multipart/multipartdemux.c index 0138f263..89e7954f 100644 --- a/gst/multipart/multipartdemux.c +++ b/gst/multipart/multipartdemux.c @@ -285,8 +285,10 @@ gst_multipart_demux_chain (GstPad * pad, GstBuffer * buf) gst_multipart_find_pad_by_mime (multipart, multipart->parsing_mime, &created); if (srcpad != NULL) { - ret = gst_pad_alloc_buffer (srcpad->pad, GST_BUFFER_OFFSET_NONE, - datalen, GST_PAD_CAPS (srcpad->pad), &outbuf); + ret = + gst_pad_alloc_buffer_and_set_caps (srcpad->pad, + GST_BUFFER_OFFSET_NONE, datalen, GST_PAD_CAPS (srcpad->pad), + &outbuf); if (ret != GST_FLOW_OK) { GST_WARNING_OBJECT (multipart, "failed allocating a %d bytes " "buffer", datalen); diff --git a/gst/multipart/multipartmux.c b/gst/multipart/multipartmux.c index 1c588b69..44e5d0bd 100644 --- a/gst/multipart/multipartmux.c +++ b/gst/multipart/multipartmux.c @@ -461,8 +461,9 @@ gst_multipart_mux_collected (GstCollectPads * pads, GstMultipartMux * mux) headerlen = strlen (header); newlen = headerlen + GST_BUFFER_SIZE (best->buffer); - ret = gst_pad_alloc_buffer (mux->srcpad, GST_BUFFER_OFFSET_NONE, newlen, - GST_PAD_CAPS (mux->srcpad), &newbuf); + ret = + gst_pad_alloc_buffer_and_set_caps (mux->srcpad, GST_BUFFER_OFFSET_NONE, + newlen, GST_PAD_CAPS (mux->srcpad), &newbuf); if (ret != GST_FLOW_OK) { GST_WARNING_OBJECT (mux, "failed allocating a %d bytes buffer", newlen); g_free (header); |