From c6389eec57456ceae66276abbefe4c599ef9bc73 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 2 May 2008 12:13:08 +0000 Subject: [PATCH] gst-libs/gst/rtp/gstbasertppayload.c: Rename the setcaps/getcaps function internally to make it clear that they are c... Original commit message from CVS: * gst-libs/gst/rtp/gstbasertppayload.c: (gst_basertppayload_init), (gst_basertppayload_sink_setcaps), (gst_basertppayload_sink_getcaps): Rename the setcaps/getcaps function internally to make it clear that they are called for the sink pad. --- ChangeLog | 8 ++++++++ gst-libs/gst/rtp/gstbasertppayload.c | 12 ++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index c234d56c3c..4fa2ccd2f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-05-02 Wim Taymans + + * gst-libs/gst/rtp/gstbasertppayload.c: (gst_basertppayload_init), + (gst_basertppayload_sink_setcaps), + (gst_basertppayload_sink_getcaps): + Rename the setcaps/getcaps function internally to make it clear that + they are called for the sink pad. + 2008-05-02 Wim Taymans * gst-libs/gst/rtp/gstbasertpdepayload.c: diff --git a/gst-libs/gst/rtp/gstbasertppayload.c b/gst-libs/gst/rtp/gstbasertppayload.c index 3e67345a3c..21e3b90677 100644 --- a/gst-libs/gst/rtp/gstbasertppayload.c +++ b/gst-libs/gst/rtp/gstbasertppayload.c @@ -90,8 +90,8 @@ static void gst_basertppayload_init (GstBaseRTPPayload * basertppayload, gpointer g_class); static void gst_basertppayload_finalize (GObject * object); -static gboolean gst_basertppayload_setcaps (GstPad * pad, GstCaps * caps); -static GstCaps *gst_basertppayload_getcaps (GstPad * pad); +static gboolean gst_basertppayload_sink_setcaps (GstPad * pad, GstCaps * caps); +static GstCaps *gst_basertppayload_sink_getcaps (GstPad * pad); static gboolean gst_basertppayload_event (GstPad * pad, GstEvent * event); static GstFlowReturn gst_basertppayload_chain (GstPad * pad, GstBuffer * buffer); @@ -234,9 +234,9 @@ gst_basertppayload_init (GstBaseRTPPayload * basertppayload, gpointer g_class) basertppayload->sinkpad = gst_pad_new_from_template (templ, "sink"); gst_pad_set_setcaps_function (basertppayload->sinkpad, - gst_basertppayload_setcaps); + gst_basertppayload_sink_setcaps); gst_pad_set_getcaps_function (basertppayload->sinkpad, - gst_basertppayload_getcaps); + gst_basertppayload_sink_getcaps); gst_pad_set_event_function (basertppayload->sinkpad, gst_basertppayload_event); gst_pad_set_chain_function (basertppayload->sinkpad, @@ -288,7 +288,7 @@ gst_basertppayload_finalize (GObject * object) } static gboolean -gst_basertppayload_setcaps (GstPad * pad, GstCaps * caps) +gst_basertppayload_sink_setcaps (GstPad * pad, GstCaps * caps) { GstBaseRTPPayload *basertppayload; GstBaseRTPPayloadClass *basertppayload_class; @@ -307,7 +307,7 @@ gst_basertppayload_setcaps (GstPad * pad, GstCaps * caps) } static GstCaps * -gst_basertppayload_getcaps (GstPad * pad) +gst_basertppayload_sink_getcaps (GstPad * pad) { GstBaseRTPPayload *basertppayload; GstBaseRTPPayloadClass *basertppayload_class;