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 /ext/flac | |
| 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 'ext/flac')
| -rw-r--r-- | ext/flac/gstflacdec.c | 7 | ||||
| -rw-r--r-- | ext/flac/gstflacenc.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c index 5f534253..dc8ed7b2 100644 --- a/ext/flac/gstflacdec.c +++ b/ext/flac/gstflacdec.c @@ -488,9 +488,10 @@ gst_flacdec_write (const FLAC__SeekableStreamDecoder * decoder, flacdec->frequency = frame->header.sample_rate; } - ret = gst_pad_alloc_buffer (flacdec->srcpad, flacdec->total_samples, - samples * channels * ((width + 7) >> 3), GST_PAD_CAPS (flacdec->srcpad), - &outbuf); + ret = + gst_pad_alloc_buffer_and_set_caps (flacdec->srcpad, + flacdec->total_samples, samples * channels * ((width + 7) >> 3), + GST_PAD_CAPS (flacdec->srcpad), &outbuf); if (ret != GST_FLOW_NOT_LINKED && ret != GST_FLOW_OK) { GST_DEBUG ("stopping flac decoder engine (%d)", (gint) ret); return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT; diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c index c90e1192..75c83796 100644 --- a/ext/flac/gstflacenc.c +++ b/ext/flac/gstflacenc.c @@ -538,8 +538,8 @@ gst_flacenc_write_callback (const FLAC__SeekableStreamEncoder * encoder, if (flacenc->stopped) return FLAC__STREAM_ENCODER_WRITE_STATUS_OK; - if (gst_pad_alloc_buffer (flacenc->srcpad, flacenc->offset, bytes, - GST_PAD_CAPS (flacenc->srcpad), &outbuf) != GST_FLOW_OK) { + if (gst_pad_alloc_buffer_and_set_caps (flacenc->srcpad, flacenc->offset, + bytes, GST_PAD_CAPS (flacenc->srcpad), &outbuf) != GST_FLOW_OK) { return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR; } |