diff options
author | Wim Taymans <wim.taymans@collabora.co.uk> | 2009-12-24 20:27:57 +0100 |
---|---|---|
committer | Wim Taymans <wim@metal.(none)> | 2009-12-24 21:45:12 +0100 |
commit | 3c0f18d765d86df2a545c4152b944a80d35f1631 (patch) | |
tree | c0693282f615ce1f717ad39c31ab3d602fa017ca | |
parent | ac03ad782a9bc059089fd1a91eb00a9b1ba05186 (diff) |
videomixer: some trivial cleanups
-rw-r--r-- | gst/videomixer/videomixer.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c index f404c286c..230f1a5df 100644 --- a/gst/videomixer/videomixer.c +++ b/gst/videomixer/videomixer.c @@ -1380,20 +1380,15 @@ gst_videomixer_collected (GstCollectPads * pads, GstVideoMixer * mix) /* Calculating out buffer size from input size */ gst_pad_set_caps (mix->srcpad, newcaps); - outsize = - gst_video_format_get_size (mix->fmt, mix->out_width, mix->out_height); - 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 */ - /* Calculating out buffer size from input size */ + } + + /* allocate an output buffer */ outsize = gst_video_format_get_size (mix->fmt, mix->out_width, mix->out_height); ret = gst_pad_alloc_buffer_and_set_caps (mix->srcpad, GST_BUFFER_OFFSET_NONE, outsize, GST_PAD_CAPS (mix->srcpad), &outbuf); - } /* This must be set at this point, otherwise we have no src caps */ g_assert (mix->blend != NULL); |