[gst-plugins-farsight/master] Selector: remove useless acceptcaps and fix getcaps

[Olivier Crête]

---
 gst/selector/fsselector.c |   15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/gst/selector/fsselector.c b/gst/selector/fsselector.c
index c3a36d7..3f19e60 100644
--- a/gst/selector/fsselector.c
+++ b/gst/selector/fsselector.c
@@ -104,8 +104,6 @@ static gboolean fs_selector_internal_sink_event (GstPad *pad, GstEvent *event);
 static gboolean fs_selector_internal_sink_query (GstPad *pad, GstQuery *query);
 static const GstQueryType* fs_selector_internal_sink_query_type (GstPad *pad);
 static GstCaps* fs_selector_internal_sink_getcaps (GstPad *pad);
-static gboolean fs_selector_internal_sink_acceptcaps (GstPad *pad,
-    GstCaps *caps);
 static GstFlowReturn fs_selector_internal_sink_buffer_alloc (GstPad *pad,
     guint64 offset, guint size, GstCaps *caps, GstBuffer **buf);
 static void fs_selector_internal_sink_fixatecaps (GstPad *pad, GstCaps *caps);
@@ -506,8 +504,6 @@ fs_selector_add_element (FsSelector *selector, GstElementFactory *factory)
       GST_DEBUG_FUNCPTR (fs_selector_internal_sink_query_type));
   gst_pad_set_getcaps_function (internal_sinkpad,
       GST_DEBUG_FUNCPTR (fs_selector_internal_sink_getcaps));
-  gst_pad_set_acceptcaps_function (internal_sinkpad,
-      GST_DEBUG_FUNCPTR (fs_selector_internal_sink_acceptcaps));
   gst_pad_set_bufferalloc_function (internal_sinkpad,
       GST_DEBUG_FUNCPTR (fs_selector_internal_sink_buffer_alloc));
   gst_pad_set_fixatecaps_function (internal_sinkpad,
@@ -1267,16 +1263,7 @@ fs_selector_internal_sink_getcaps (GstPad *pad)
   FsSelector *selector = FS_SELECTOR (g_object_get_qdata (G_OBJECT (pad),
           parent_quark));
 
-  return gst_pad_get_caps (selector->srcpad);
-}
-
-static gboolean
-fs_selector_internal_sink_acceptcaps (GstPad *pad, GstCaps *caps)
-{
-  FsSelector *selector = FS_SELECTOR (g_object_get_qdata (G_OBJECT (pad),
-          parent_quark));
-
-  return gst_pad_accept_caps (selector->srcpad, caps);
+  return gst_pad_peer_get_caps (selector->srcpad);
 }
 
 static void
-- 
1.5.6.5