summaryrefslogtreecommitdiff
path: root/gst/encoding/gststreamcombiner.c
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2011-05-10 16:44:37 +0200
committerWim Taymans <wim.taymans@collabora.co.uk>2011-05-10 16:44:37 +0200
commit7cad11e9128b59adbdb1179759b6e176982f506c (patch)
tree3f1a38550a0465736e3c438d59776ef7be9fe433 /gst/encoding/gststreamcombiner.c
parent995fe2fedcdef0197e9e5759217db9f9ec42e927 (diff)
-base: fix for now request pad API
Diffstat (limited to 'gst/encoding/gststreamcombiner.c')
-rw-r--r--gst/encoding/gststreamcombiner.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/encoding/gststreamcombiner.c b/gst/encoding/gststreamcombiner.c
index 72d40fe75..4914cf8f8 100644
--- a/gst/encoding/gststreamcombiner.c
+++ b/gst/encoding/gststreamcombiner.c
@@ -44,7 +44,7 @@ G_DEFINE_TYPE (GstStreamCombiner, gst_stream_combiner, GST_TYPE_ELEMENT);
static void gst_stream_combiner_dispose (GObject * object);
static GstPad *gst_stream_combiner_request_new_pad (GstElement * element,
- GstPadTemplate * templ, const gchar * name);
+ GstPadTemplate * templ, const gchar * name, const GstCaps * caps);
static void gst_stream_combiner_release_pad (GstElement * element,
GstPad * pad);
@@ -217,7 +217,7 @@ gst_stream_combiner_init (GstStreamCombiner * stream_combiner)
static GstPad *
gst_stream_combiner_request_new_pad (GstElement * element,
- GstPadTemplate * templ, const gchar * name)
+ GstPadTemplate * templ, const gchar * name, const GstCaps * caps)
{
GstStreamCombiner *stream_combiner = (GstStreamCombiner *) element;
GstPad *sinkpad;