diff options
| author | David Schleef <ds@schleef.org> | 2003-12-22 01:47:09 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2003-12-22 01:47:09 +0000 |
| commit | b144bc6c58979f49a6e8e04a04a65f771247297a (patch) | |
| tree | 648bc437ca5562bc7c67224ad71ef90dfacc12d1 /gst/switch/gstswitch.c | |
| parent | 2309d726b7b0c37dbd9c57c653e2053ec6258ac8 (diff) | |
| download | gst-plugins-bad-b144bc6c58979f49a6e8e04a04a65f771247297a.tar.gz gst-plugins-bad-b144bc6c58979f49a6e8e04a04a65f771247297a.tar.bz2 gst-plugins-bad-b144bc6c58979f49a6e8e04a04a65f771247297a.zip | |
Merge CAPS branch
Original commit message from CVS:
Merge CAPS branch
Diffstat (limited to 'gst/switch/gstswitch.c')
| -rw-r--r-- | gst/switch/gstswitch.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gst/switch/gstswitch.c b/gst/switch/gstswitch.c index 09da3cdb..625eba29 100644 --- a/gst/switch/gstswitch.c +++ b/gst/switch/gstswitch.c @@ -38,11 +38,12 @@ static GstElementDetails gst_switch_details = GST_ELEMENT_DETAILS ( "Julien Moutte <julien@moutte.net>" ); -GST_PAD_TEMPLATE_FACTORY (gst_switch_sink_factory, +static GstStaticPadTemplate gst_switch_sink_factory = +GST_STATIC_PAD_TEMPLATE ( "sink%d", GST_PAD_SINK, GST_PAD_REQUEST, - GST_CAPS_ANY + GST_STATIC_CAPS_ANY ); static GstElementClass *parent_class = NULL; @@ -249,7 +250,7 @@ gst_switch_base_init (gpointer g_class) gst_element_class_set_details (element_class, &gst_switch_details); gst_element_class_add_pad_template (element_class, - GST_PAD_TEMPLATE_GET (gst_switch_sink_factory)); + gst_static_pad_template_get (&gst_switch_sink_factory)); } static void |