diff options
| author | David Schleef <ds@schleef.org> | 2003-12-18 08:38:33 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2003-12-18 08:38:33 +0000 |
| commit | 70a4a0e00218745b2bf7ad0b145fe9a967981cb4 (patch) | |
| tree | b053dbe2c3629c6380fe87478fa588e92773dde1 /sys/v4l2 | |
| parent | 55ad1b72402100a5107d112996e0477ad65ff4ba (diff) | |
| download | gst-plugins-bad-70a4a0e00218745b2bf7ad0b145fe9a967981cb4.tar.gz gst-plugins-bad-70a4a0e00218745b2bf7ad0b145fe9a967981cb4.tar.bz2 gst-plugins-bad-70a4a0e00218745b2bf7ad0b145fe9a967981cb4.zip | |
Merge HEAD from CAPS-ROOT to CAPS-MERGE-3
Original commit message from CVS:
Merge HEAD from CAPS-ROOT to CAPS-MERGE-3
Diffstat (limited to 'sys/v4l2')
| -rw-r--r-- | sys/v4l2/gstv4l2.c | 1 | ||||
| -rw-r--r-- | sys/v4l2/gstv4l2element.c | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/v4l2/gstv4l2.c b/sys/v4l2/gstv4l2.c index 0054d939..f91e10ce 100644 --- a/sys/v4l2/gstv4l2.c +++ b/sys/v4l2/gstv4l2.c @@ -51,7 +51,6 @@ GST_PLUGIN_DEFINE ( plugin_init, VERSION, GST_LICENSE, - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN ) diff --git a/sys/v4l2/gstv4l2element.c b/sys/v4l2/gstv4l2element.c index 53893fac..d99f6d6d 100644 --- a/sys/v4l2/gstv4l2element.c +++ b/sys/v4l2/gstv4l2element.c @@ -78,8 +78,8 @@ static guint gst_v4l2element_signals[LAST_SIGNAL] = { 0 }; static gboolean -gst_v4l2_iface_supported (GstInterface *iface, - GType iface_type) +gst_v4l2_iface_supported (GstImplementsInterface *iface, + GType iface_type) { GstV4l2Element *v4l2element = GST_V4L2ELEMENT (iface); @@ -99,7 +99,7 @@ gst_v4l2_iface_supported (GstInterface *iface, static void -gst_v4l2_interface_init (GstInterfaceClass *klass) +gst_v4l2_interface_init (GstImplementsInterfaceClass *klass) { /* default virtual functions */ klass->supported = gst_v4l2_iface_supported; @@ -315,7 +315,7 @@ gst_v4l2element_get_type (void) "GstV4l2Element", &v4l2element_info, 0); g_type_add_interface_static (v4l2element_type, - GST_TYPE_INTERFACE, + GST_TYPE_IMPLEMENTS_INTERFACE, &v4l2iface_info); g_type_add_interface_static (v4l2element_type, GST_TYPE_TUNER, |