From 8e3c533fcf5c7dfc365871c3601008a0cb06ce42 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Fri, 10 Jan 2003 13:38:32 +0000 Subject: PadConnect -> PadLink Original commit message from CVS: PadConnect -> PadLink --- ext/gsm/gstgsmdec.c | 4 ++-- ext/gsm/gstgsmenc.c | 4 ++-- ext/hermes/gstcolorspace.c | 12 ++++++------ ext/jack/gstjack.c | 4 ++-- ext/ladspa/gstladspa.c | 8 ++++---- ext/lcs/gstcolorspace.c | 12 ++++++------ ext/libfame/gstfamedec.c | 2 +- ext/libfame/gstlibfame.c | 2 +- ext/sdl/sdlvideosink.c | 4 ++-- ext/swfdec/gstswfdec.c | 2 +- ext/tarkin/gsttarkinenc.c | 2 +- gst/chart/gstchart.c | 4 ++-- gst/deinterlace/gstdeinterlace.c | 2 +- gst/filter/gstbpwsinc.c | 6 +++--- gst/filter/gstiir.c | 6 +++--- gst/filter/gstlpwsinc.c | 6 +++--- gst/mixmatrix/mixmatrix.c | 4 ++-- gst/passthrough/gstpassthrough.c | 4 ++-- gst/playondemand/gstplayondemand.c | 4 ++-- gst/smooth/gstsmooth.c | 2 +- gst/speed/gstspeed.c | 2 +- gst/videocrop/gstvideocrop.c | 4 ++-- gst/virtualdub/gstxsharpen.c | 2 +- gst/y4m/gsty4mencode.c | 2 +- sys/v4l2/gstv4l2src.c | 6 +++--- 25 files changed, 55 insertions(+), 55 deletions(-) diff --git a/ext/gsm/gstgsmdec.c b/ext/gsm/gstgsmdec.c index 30a183c3..bf5cf68f 100644 --- a/ext/gsm/gstgsmdec.c +++ b/ext/gsm/gstgsmdec.c @@ -50,7 +50,7 @@ static void gst_gsmdec_class_init (GstGSMDec *klass); static void gst_gsmdec_init (GstGSMDec *gsmdec); static void gst_gsmdec_chain (GstPad *pad, GstBuffer *buf); -static GstPadConnectReturn gst_gsmdec_sinkconnect (GstPad *pad, GstCaps *caps); +static GstPadLinkReturn gst_gsmdec_sinkconnect (GstPad *pad, GstCaps *caps); static GstElementClass *parent_class = NULL; /*static guint gst_gsmdec_signals[LAST_SIGNAL] = { 0 }; */ @@ -103,7 +103,7 @@ gst_gsmdec_init (GstGSMDec *gsmdec) gsmdec->bufsize = 0; } -static GstPadConnectReturn +static GstPadLinkReturn gst_gsmdec_sinkconnect (GstPad *pad, GstCaps *caps) { GstGSMDec *gsmdec; diff --git a/ext/gsm/gstgsmenc.c b/ext/gsm/gstgsmenc.c index d3ece7e8..9084257b 100644 --- a/ext/gsm/gstgsmenc.c +++ b/ext/gsm/gstgsmenc.c @@ -51,7 +51,7 @@ static void gst_gsmenc_class_init (GstGSMEnc *klass); static void gst_gsmenc_init (GstGSMEnc *gsmenc); static void gst_gsmenc_chain (GstPad *pad,GstBuffer *buf); -static GstPadConnectReturn gst_gsmenc_sinkconnect (GstPad *pad, GstCaps *caps); +static GstPadLinkReturn gst_gsmenc_sinkconnect (GstPad *pad, GstCaps *caps); static GstElementClass *parent_class = NULL; static guint gst_gsmenc_signals[LAST_SIGNAL] = { 0 }; @@ -114,7 +114,7 @@ gst_gsmenc_init (GstGSMEnc *gsmenc) gsmenc->rate = 8000; } -static GstPadConnectReturn +static GstPadLinkReturn gst_gsmenc_sinkconnect (GstPad *pad, GstCaps *caps) { GstGSMEnc *gsmenc; diff --git a/ext/hermes/gstcolorspace.c b/ext/hermes/gstcolorspace.c index 933571a5..484c7e3c 100644 --- a/ext/hermes/gstcolorspace.c +++ b/ext/hermes/gstcolorspace.c @@ -91,11 +91,11 @@ static void gst_colorspace_set_property (GObject *object, guint prop_id, static void gst_colorspace_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); -static GstPadConnectReturn +static GstPadLinkReturn gst_colorspace_sinkconnect (GstPad *pad, GstCaps *caps); -static GstPadConnectReturn +static GstPadLinkReturn gst_colorspace_srcconnect (GstPad *pad, GstCaps *caps); -static GstPadConnectReturn +static GstPadLinkReturn gst_colorspace_srcconnect_func (GstPad *pad, GstCaps *caps, gboolean newcaps); static void gst_colorspace_chain (GstPad *pad, GstBuffer *buf); static GstElementStateReturn @@ -286,7 +286,7 @@ gst_colorspace_getcaps (GstPad *pad, GstCaps *caps) return result; } -static GstPadConnectReturn +static GstPadLinkReturn gst_colorspace_sinkconnect (GstPad *pad, GstCaps *caps) { GstColorspace *space; @@ -316,13 +316,13 @@ gst_colorspace_sinkconnect (GstPad *pad, GstCaps *caps) return GST_PAD_LINK_OK; } -static GstPadConnectReturn +static GstPadLinkReturn gst_colorspace_srcconnect (GstPad *pad, GstCaps *caps) { return gst_colorspace_srcconnect_func (pad, caps, TRUE); } -static GstPadConnectReturn +static GstPadLinkReturn gst_colorspace_srcconnect_func (GstPad *pad, GstCaps *caps, gboolean newcaps) { GstColorspace *space; diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c index 25c57eb5..11e80c08 100644 --- a/ext/jack/gstjack.c +++ b/ext/jack/gstjack.c @@ -82,7 +82,7 @@ static GstPad* gst_jack_request_new_pad (GstElement *element, GstPadTemplate *te static void gst_jack_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void gst_jack_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); static GstElementStateReturn gst_jack_change_state(GstElement *element); -static GstPadConnectReturn gst_jack_connect (GstPad *pad, GstCaps *caps); +static GstPadLinkReturn gst_jack_connect (GstPad *pad, GstCaps *caps); static void gst_jack_loop (GstElement *element); @@ -395,7 +395,7 @@ gst_jack_change_state (GstElement *element) return GST_STATE_SUCCESS; } -static GstPadConnectReturn +static GstPadLinkReturn gst_jack_connect (GstPad *pad, GstCaps *caps) { GstJack *this; diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c index 02b4609c..7f941b81 100644 --- a/ext/ladspa/gstladspa.c +++ b/ext/ladspa/gstladspa.c @@ -72,8 +72,8 @@ static void gst_ladspa_class_init (GstLADSPAClass *klass); static void gst_ladspa_init (GstLADSPA *ladspa); static void gst_ladspa_update_int(const GValue *value, gpointer data); -static GstPadConnectReturn gst_ladspa_connect (GstPad *pad, GstCaps *caps); -static GstPadConnectReturn gst_ladspa_connect_get (GstPad *pad, GstCaps *caps); +static GstPadLinkReturn gst_ladspa_connect (GstPad *pad, GstCaps *caps); +static GstPadLinkReturn gst_ladspa_connect_get (GstPad *pad, GstCaps *caps); static void gst_ladspa_force_src_caps (GstLADSPA *ladspa, GstPad *pad); static void gst_ladspa_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); @@ -482,7 +482,7 @@ gst_ladspa_update_int(const GValue *value, gpointer data) *target = (gfloat)g_value_get_int(value); } -static GstPadConnectReturn +static GstPadLinkReturn gst_ladspa_connect (GstPad *pad, GstCaps *caps) { GstLADSPA *ladspa = (GstLADSPA *) GST_PAD_PARENT (pad); @@ -516,7 +516,7 @@ gst_ladspa_connect (GstPad *pad, GstCaps *caps) return GST_PAD_LINK_OK; } -static GstPadConnectReturn +static GstPadLinkReturn gst_ladspa_connect_get (GstPad *pad, GstCaps *caps) { GstLADSPA *ladspa = (GstLADSPA*)GST_OBJECT_PARENT (pad); diff --git a/ext/lcs/gstcolorspace.c b/ext/lcs/gstcolorspace.c index 43591fcb..ff9e43b0 100644 --- a/ext/lcs/gstcolorspace.c +++ b/ext/lcs/gstcolorspace.c @@ -129,11 +129,11 @@ static void gst_colorspace_set_property (GObject *object, guint prop_id, static void gst_colorspace_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); -static GstPadConnectReturn +static GstPadLinkReturn gst_colorspace_sinkconnect (GstPad *pad, GstCaps *caps); -static GstPadConnectReturn +static GstPadLinkReturn gst_colorspace_srcconnect (GstPad *pad, GstCaps *caps); -static GstPadConnectReturn +static GstPadLinkReturn gst_colorspace_srcconnect_func (GstPad *pad, GstCaps *caps, gboolean newcaps); static void gst_colorspace_chain (GstPad *pad, GstBuffer *buf); static GstElementStateReturn @@ -243,7 +243,7 @@ gst_colorspace_getcaps (GstPad *pad, GstCaps *caps) return result; } -static GstPadConnectReturn +static GstPadLinkReturn gst_colorspace_sinkconnect (GstPad *pad, GstCaps *caps) { GstColorspace *space; @@ -273,13 +273,13 @@ gst_colorspace_sinkconnect (GstPad *pad, GstCaps *caps) return GST_PAD_LINK_OK; } -static GstPadConnectReturn +static GstPadLinkReturn gst_colorspace_srcconnect (GstPad *pad, GstCaps *caps) { return gst_colorspace_srcconnect_func (pad, caps, TRUE); } -static GstPadConnectReturn +static GstPadLinkReturn gst_colorspace_srcconnect_func (GstPad *pad, GstCaps *caps, gboolean newcaps) { GstColorspace *space; diff --git a/ext/libfame/gstfamedec.c b/ext/libfame/gstfamedec.c index d46dfb5e..abab52bc 100644 --- a/ext/libfame/gstfamedec.c +++ b/ext/libfame/gstfamedec.c @@ -297,7 +297,7 @@ gst_famedec_class_init (GstFameEncClass *klass) 0, 1024*1024, FAMEENC_BUFFER_SIZE, G_PARAM_READWRITE)); } -static GstPadConnectReturn +static GstPadLinkReturn gst_famedec_sinkconnect (GstPad *pad, GstCaps *caps) { gint width, height; diff --git a/ext/libfame/gstlibfame.c b/ext/libfame/gstlibfame.c index a3a99764..fdeaaa7f 100644 --- a/ext/libfame/gstlibfame.c +++ b/ext/libfame/gstlibfame.c @@ -296,7 +296,7 @@ gst_fameenc_class_init (GstFameEncClass *klass) 0, 1024*1024, FAMEENC_BUFFER_SIZE, G_PARAM_READWRITE)); } -static GstPadConnectReturn +static GstPadLinkReturn gst_fameenc_sinkconnect (GstPad *pad, GstCaps *caps) { gint width, height; diff --git a/ext/sdl/sdlvideosink.c b/ext/sdl/sdlvideosink.c index 86c63660..67e1ea61 100644 --- a/ext/sdl/sdlvideosink.c +++ b/ext/sdl/sdlvideosink.c @@ -64,7 +64,7 @@ static void gst_sdlvideosink_set_clock (GstElement *element, GstClock static gboolean gst_sdlvideosink_create (GstSDLVideoSink *sdlvideosink, gboolean showlogo); -static GstPadConnectReturn gst_sdlvideosink_sinkconnect (GstPad *pad, +static GstPadLinkReturn gst_sdlvideosink_sinkconnect (GstPad *pad, GstCaps *caps); static void gst_sdlvideosink_chain (GstPad *pad, GstBuffer *buf); @@ -356,7 +356,7 @@ gst_sdlvideosink_create (GstSDLVideoSink *sdlvideosink, gboolean showlogo) return TRUE; } -static GstPadConnectReturn +static GstPadLinkReturn gst_sdlvideosink_sinkconnect (GstPad *pad, GstCaps *vscapslist) { diff --git a/ext/swfdec/gstswfdec.c b/ext/swfdec/gstswfdec.c index 8ec93e4d..2933db80 100644 --- a/ext/swfdec/gstswfdec.c +++ b/ext/swfdec/gstswfdec.c @@ -385,7 +385,7 @@ gst_swfdec_vo_destroy (GstSwfdec *swfdec) #endif #if 0 -static GstPadConnectReturn +static GstPadLinkReturn gst_swfdec_connect(GstPad *pad, GstCaps *caps) { return GST_PAD_LINK_DELAYED; diff --git a/ext/tarkin/gsttarkinenc.c b/ext/tarkin/gsttarkinenc.c index 30d7394b..327b38fd 100644 --- a/ext/tarkin/gsttarkinenc.c +++ b/ext/tarkin/gsttarkinenc.c @@ -116,7 +116,7 @@ gst_tarkinenc_class_init (TarkinEncClass *klass) gobject_class->get_property = gst_tarkinenc_get_property; } -static GstPadConnectReturn +static GstPadLinkReturn gst_tarkinenc_sinkconnect (GstPad *pad, GstCaps *caps) { TarkinEnc *tarkinenc; diff --git a/gst/chart/gstchart.c b/gst/chart/gstchart.c index bbe57e86..da8954ec 100644 --- a/gst/chart/gstchart.c +++ b/gst/chart/gstchart.c @@ -164,7 +164,7 @@ static void gst_chart_get_property (GObject *object, guint prop_id, GValue *valu static void gst_chart_chain (GstPad *pad, GstBuffer *buf); -static GstPadConnectReturn +static GstPadLinkReturn gst_chart_sinkconnect (GstPad *pad, GstCaps *caps); static GstElementClass *parent_class = NULL; @@ -231,7 +231,7 @@ gst_chart_init (GstChart *chart) chart->samples_since_last_frame = 0; } -static GstPadConnectReturn +static GstPadLinkReturn gst_chart_sinkconnect (GstPad *pad, GstCaps *caps) { GstChart *chart; diff --git a/gst/deinterlace/gstdeinterlace.c b/gst/deinterlace/gstdeinterlace.c index 6ed84123..1ff62880 100644 --- a/gst/deinterlace/gstdeinterlace.c +++ b/gst/deinterlace/gstdeinterlace.c @@ -138,7 +138,7 @@ gst_deinterlace_class_init (GstDeInterlaceClass *klass) gobject_class->get_property = gst_deinterlace_get_property; } -static GstPadConnectReturn +static GstPadLinkReturn gst_deinterlace_sinkconnect (GstPad *pad, GstCaps *caps) { GstDeInterlace *filter; diff --git a/gst/filter/gstbpwsinc.c b/gst/filter/gstbpwsinc.c index 89c95f93..7ee8680b 100644 --- a/gst/filter/gstbpwsinc.c +++ b/gst/filter/gstbpwsinc.c @@ -102,7 +102,7 @@ static void gst_bpwsinc_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); static void gst_bpwsinc_chain (GstPad * pad, GstBuffer * buf); -static GstPadConnectReturn +static GstPadLinkReturn gst_bpwsinc_sink_connect (GstPad * pad, GstCaps * caps); static GstElementClass *parent_class = NULL; @@ -174,14 +174,14 @@ gst_bpwsinc_init (GstBPWSinc * filter) filter->kernel = NULL; } -static GstPadConnectReturn +static GstPadLinkReturn gst_bpwsinc_sink_connect (GstPad * pad, GstCaps * caps) { int i = 0; double sum = 0.0; int len = 0; double *kernel_lp, *kernel_hp; - GstPadConnectReturn set_retval; + GstPadLinkReturn set_retval; GstBPWSinc *filter = GST_BPWSINC (gst_pad_get_parent (pad)); diff --git a/gst/filter/gstiir.c b/gst/filter/gstiir.c index 7f447f77..9b4deb88 100644 --- a/gst/filter/gstiir.c +++ b/gst/filter/gstiir.c @@ -87,7 +87,7 @@ static void gst_iir_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); static void gst_iir_chain (GstPad * pad, GstBuffer * buf); -static GstPadConnectReturn +static GstPadLinkReturn gst_iir_sink_connect (GstPad * pad, GstCaps * caps); static GstElementClass *parent_class = NULL; @@ -161,11 +161,11 @@ gst_iir_init (GstIIR * filter) filter->state = NULL; } -static GstPadConnectReturn +static GstPadLinkReturn gst_iir_sink_connect (GstPad * pad, GstCaps * caps) { GstIIR *filter; - GstPadConnectReturn set_retval; + GstPadLinkReturn set_retval; filter = GST_IIR (gst_pad_get_parent (pad)); diff --git a/gst/filter/gstlpwsinc.c b/gst/filter/gstlpwsinc.c index 6be8e1ad..74cea70e 100644 --- a/gst/filter/gstlpwsinc.c +++ b/gst/filter/gstlpwsinc.c @@ -99,7 +99,7 @@ static void gst_lpwsinc_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); static void gst_lpwsinc_chain (GstPad * pad, GstBuffer * buf); -static GstPadConnectReturn +static GstPadLinkReturn gst_lpwsinc_sink_connect (GstPad * pad, GstCaps * caps); static GstElementClass *parent_class = NULL; @@ -165,14 +165,14 @@ gst_lpwsinc_init (GstLPWSinc * filter) filter->kernel = NULL; } -static GstPadConnectReturn +static GstPadLinkReturn gst_lpwsinc_sink_connect (GstPad * pad, GstCaps * caps) { int i = 0; double sum = 0.0; int len = 0; GstLPWSinc *filter = GST_LPWSINC (gst_pad_get_parent (pad)); - GstPadConnectReturn set_retval; + GstPadLinkReturn set_retval; g_assert (GST_IS_PAD (pad)); g_assert (caps != NULL); diff --git a/gst/mixmatrix/mixmatrix.c b/gst/mixmatrix/mixmatrix.c index cc644860..9d76cc76 100644 --- a/gst/mixmatrix/mixmatrix.c +++ b/gst/mixmatrix/mixmatrix.c @@ -105,7 +105,7 @@ static void gst_mixmatrix_set_property (GObject *object, guint prop_id, const GV static void gst_mixmatrix_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); static GstPad * gst_mixmatrix_request_new_pad (GstElement *element, GstPadTemplate *temp, const gchar *name); -static GstPadConnectReturn gst_mixmatrix_connect (GstPad *pad, GstCaps *caps); +static GstPadLinkReturn gst_mixmatrix_connect (GstPad *pad, GstCaps *caps); static void gst_mixmatrix_loop (GstElement *element); @@ -300,7 +300,7 @@ gst_mixmatrix_set_all_caps (GstMixMatrix *mix) } */ -static GstPadConnectReturn +static GstPadLinkReturn gst_mixmatrix_connect (GstPad *pad, GstCaps *caps) { GstMixMatrix *mix = GST_MIXMATRIX(GST_PAD_PARENT(pad)); diff --git a/gst/passthrough/gstpassthrough.c b/gst/passthrough/gstpassthrough.c index f92790e0..1b45f156 100644 --- a/gst/passthrough/gstpassthrough.c +++ b/gst/passthrough/gstpassthrough.c @@ -90,7 +90,7 @@ static void passthrough_init (GstPassthrough *filter); static void passthrough_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void passthrough_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); -static GstPadConnectReturn passthrough_connect_sink (GstPad *pad, GstCaps *caps); +static GstPadLinkReturn passthrough_connect_sink (GstPad *pad, GstCaps *caps); static void passthrough_chain (GstPad *pad, GstBuffer *buf); static void inline passthrough_fast_float_chain (gfloat* data, guint numsamples); @@ -109,7 +109,7 @@ passthrough_get_bufferpool (GstPad *pad) return gst_pad_get_bufferpool (filter->srcpad); } -static GstPadConnectReturn +static GstPadLinkReturn passthrough_connect_sink (GstPad *pad, GstCaps *caps) { const gchar *format; diff --git a/gst/playondemand/gstplayondemand.c b/gst/playondemand/gstplayondemand.c index 7d9959cd..1784cb86 100644 --- a/gst/playondemand/gstplayondemand.c +++ b/gst/playondemand/gstplayondemand.c @@ -111,7 +111,7 @@ static void play_on_demand_get_property (GObject *object, GValue *value, GParamSpec *pspec); -static GstPadConnectReturn play_on_demand_pad_connect (GstPad *pad, GstCaps *caps); +static GstPadLinkReturn play_on_demand_pad_connect (GstPad *pad, GstCaps *caps); static void play_on_demand_loop (GstElement *elem); @@ -135,7 +135,7 @@ play_on_demand_get_bufferpool (GstPad *pad) return gst_pad_get_bufferpool(filter->srcpad); } -static GstPadConnectReturn +static GstPadLinkReturn play_on_demand_pad_connect (GstPad *pad, GstCaps *caps) { const gchar *format; diff --git a/gst/smooth/gstsmooth.c b/gst/smooth/gstsmooth.c index 0a130024..434078c7 100644 --- a/gst/smooth/gstsmooth.c +++ b/gst/smooth/gstsmooth.c @@ -128,7 +128,7 @@ gst_smooth_class_init (GstSmoothClass *klass) } -static GstPadConnectReturn +static GstPadLinkReturn gst_smooth_sinkconnect (GstPad *pad, GstCaps *caps) { GstSmooth *filter; diff --git a/gst/speed/gstspeed.c b/gst/speed/gstspeed.c index d883b6e4..01d2a96d 100644 --- a/gst/speed/gstspeed.c +++ b/gst/speed/gstspeed.c @@ -111,7 +111,7 @@ static void speed_loop (GstElement *element); static GstElementClass *parent_class = NULL; /*static guint gst_filter_signals[LAST_SIGNAL] = { 0 }; */ -static GstPadConnectReturn +static GstPadLinkReturn speed_connect (GstPad *pad, GstCaps *caps) { GstSpeed *filter; diff --git a/gst/videocrop/gstvideocrop.c b/gst/videocrop/gstvideocrop.c index 2ee1fce9..0a3fb1a5 100644 --- a/gst/videocrop/gstvideocrop.c +++ b/gst/videocrop/gstvideocrop.c @@ -110,7 +110,7 @@ static void gst_video_crop_set_property (GObject *object, guint prop_id, static void gst_video_crop_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); -static GstPadConnectReturn +static GstPadLinkReturn gst_video_crop_sink_connect (GstPad *pad, GstCaps *caps); static void gst_video_crop_chain (GstPad *pad, GstBuffer *buffer); @@ -253,7 +253,7 @@ gst_video_crop_get_property (GObject *object, guint prop_id, GValue *value, GPar } } -static GstPadConnectReturn +static GstPadLinkReturn gst_video_crop_sink_connect (GstPad *pad, GstCaps *caps) { GstVideoCrop *video_crop; diff --git a/gst/virtualdub/gstxsharpen.c b/gst/virtualdub/gstxsharpen.c index f7368973..d289338b 100644 --- a/gst/virtualdub/gstxsharpen.c +++ b/gst/virtualdub/gstxsharpen.c @@ -131,7 +131,7 @@ gst_xsharpen_class_init (GstXsharpenClass * klass) gobject_class->get_property = gst_xsharpen_get_property; } -static GstPadConnectReturn +static GstPadLinkReturn gst_xsharpen_sinkconnect (GstPad * pad, GstCaps * caps) { GstXsharpen *sharpen; diff --git a/gst/y4m/gsty4mencode.c b/gst/y4m/gsty4mencode.c index 6a24b18c..442ce0aa 100644 --- a/gst/y4m/gsty4mencode.c +++ b/gst/y4m/gsty4mencode.c @@ -116,7 +116,7 @@ gst_lavencode_class_init (GstLavEncodeClass *klass) gobject_class->get_property = gst_lavencode_get_property; } -static GstPadConnectReturn +static GstPadLinkReturn gst_lavencode_sinkconnect (GstPad *pad, GstCaps *caps) { GstLavEncode *filter; diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c index cf72cb07..c84993aa 100644 --- a/sys/v4l2/gstv4l2src.c +++ b/sys/v4l2/gstv4l2src.c @@ -68,7 +68,7 @@ static gboolean gst_v4l2src_srcconvert (GstPad *pad, gint64 src_value, GstFormat *dest_format, gint64 *dest_value); -static GstPadConnectReturn gst_v4l2src_srcconnect (GstPad *pad, +static GstPadLinkReturn gst_v4l2src_srcconnect (GstPad *pad, GstCaps *caps); static GstCaps * gst_v4l2src_getcaps (GstPad *pad, GstCaps *caps); @@ -576,7 +576,7 @@ gst_v4l2src_caps_intersect (GstCaps *caps1, } -static GstPadConnectReturn +static GstPadLinkReturn gst_v4l2src_srcconnect (GstPad *pad, GstCaps *vscapslist) { @@ -628,7 +628,7 @@ gst_v4l2src_srcconnect (GstPad *pad, format->flags & V4L2_FMT_FLAG_COMPRESSED); GstCaps *onecaps; for (;lastcaps != NULL; lastcaps = lastcaps->next) { - GstPadConnectReturn ret_val; + GstPadLinkReturn ret_val; onecaps = gst_caps_copy_1(lastcaps); if ((ret_val = gst_pad_try_set_caps(v4l2src->srcpad, onecaps)) > 0) { if (gst_v4l2src_capture_init(v4l2src)) -- cgit v1.2.1