videomixer: some trivial cleanups

1 files changed, 7 insertions, 12 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,21 +1380,16 @@ 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 */
-    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);
   }
 
+  /* 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);