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/matroska | |
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/matroska')
-rw-r--r-- | gst/matroska/matroska-demux.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index d7f46d47..188bab19 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -2005,7 +2005,7 @@ gst_matroska_demux_push_vorbis_codec_priv_data (GstMatroskaDemux * demux, for (i = 0; i < 2; i++) { length = p[i + 1]; - if (gst_pad_alloc_buffer (stream->pad, GST_BUFFER_OFFSET_NONE, + if (gst_pad_alloc_buffer_and_set_caps (stream->pad, GST_BUFFER_OFFSET_NONE, length, stream->caps, &priv) == GST_FLOW_OK) { memcpy (GST_BUFFER_DATA (priv), &p[offset], length); @@ -2016,8 +2016,8 @@ gst_matroska_demux_push_vorbis_codec_priv_data (GstMatroskaDemux * demux, offset += length; } length = stream->codec_priv_size - offset; - if (gst_pad_alloc_buffer (stream->pad, GST_BUFFER_OFFSET_NONE, length, - stream->caps, &priv) == GST_FLOW_OK) { + if (gst_pad_alloc_buffer_and_set_caps (stream->pad, GST_BUFFER_OFFSET_NONE, + length, stream->caps, &priv) == GST_FLOW_OK) { memcpy (GST_BUFFER_DATA (priv), &p[offset], length); ret = gst_pad_push (stream->pad, priv); if (ret != GST_FLOW_OK && ret != GST_FLOW_NOT_LINKED) @@ -2063,8 +2063,8 @@ gst_matroska_demux_add_wvpk_header (GstMatroskaTrackContext * stream, /* block_samples, flags and crc are already in the buffer */ newlen = block_length + sizeof (Wavpack4Header) - 12; - if (gst_pad_alloc_buffer (stream->pad, GST_BUFFER_OFFSET_NONE, newlen, - stream->caps, &newbuf) != GST_FLOW_OK) { + if (gst_pad_alloc_buffer_and_set_caps (stream->pad, GST_BUFFER_OFFSET_NONE, + newlen, stream->caps, &newbuf) != GST_FLOW_OK) { return TRUE; /* not an error, pad might not be linked */ } |