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/videomixer/videomixer.c | |
| 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/videomixer/videomixer.c')
| -rw-r--r-- | gst/videomixer/videomixer.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c index a71ddcde..f0f2377c 100644 --- a/gst/videomixer/videomixer.c +++ b/gst/videomixer/videomixer.c @@ -1044,7 +1044,7 @@ gst_videomixer_loop (GstElement * element) outsize = ROUND_UP_2 (mix->out_width) * ROUND_UP_2 (mix->out_height) * 4; - outbuf = gst_pad_alloc_buffer (mix->srcpad, GST_BUFFER_OFFSET_NONE, outsize); + outbuf = gst_pad_alloc_buffer_and_set_caps (mix->srcpad, GST_BUFFER_OFFSET_NONE, outsize); switch (mix->background) { case VIDEO_MIXER_BACKGROUND_CHECKER: gst_videomixer_fill_checker (GST_BUFFER_DATA (outbuf), @@ -1106,12 +1106,14 @@ gst_videomixer_collected (GstCollectPads * pads, GstVideoMixer * mix) mix->out_width = mix->in_width; mix->out_height = mix->in_height; - ret = gst_pad_alloc_buffer (mix->srcpad, GST_BUFFER_OFFSET_NONE, outsize, - newcaps, &outbuf); + ret = + gst_pad_alloc_buffer_and_set_caps (mix->srcpad, GST_BUFFER_OFFSET_NONE, + outsize, newcaps, &outbuf); gst_caps_unref (newcaps); } else { /* Otherwise we just allocate a buffer from current caps */ - ret = gst_pad_alloc_buffer (mix->srcpad, GST_BUFFER_OFFSET_NONE, outsize, - GST_PAD_CAPS (mix->srcpad), &outbuf); + ret = + gst_pad_alloc_buffer_and_set_caps (mix->srcpad, GST_BUFFER_OFFSET_NONE, + outsize, GST_PAD_CAPS (mix->srcpad), &outbuf); } if (ret != GST_FLOW_OK) { |