Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / gst / gstghostpad.h

diff --git a/gst/gstghostpad.h b/gst/gstghostpad.h
index 4184e9f..37d27a2 100644 (file)
--- a/gst/gstghostpad.h
+++ b/gst/gstghostpad.h
@@ -64,14 +64,13 @@ GstProxyPad*     gst_proxy_pad_get_internal     (GstProxyPad *pad);
 
 const GstQueryType* gst_proxy_pad_query_type_default             (GstPad *pad);
 gboolean            gst_proxy_pad_event_default                  (GstPad *pad, GstEvent *event);
-gboolean            gst_proxy_pad_query_default                  (GstPad *pad, GstQuery *query);
+gboolean            gst_proxy_pad_query_default                  (GstPad *pad, GstQuery **query);
 GstIterator*        gst_proxy_pad_iterate_internal_links_default (GstPad *pad);
-GstFlowReturn       gst_proxy_pad_bufferalloc_default            (GstPad *pad, guint64 offset, guint size, GstCaps *caps, GstBuffer **buf);
 GstFlowReturn       gst_proxy_pad_chain_default                  (GstPad *pad, GstBuffer *buf);
 GstFlowReturn       gst_proxy_pad_chain_list_default             (GstPad *pad, GstBufferList *list);
 GstFlowReturn       gst_proxy_pad_getrange_default               (GstPad *pad, guint64 offset, guint size, GstBuffer **buffer);
 gboolean            gst_proxy_pad_checkgetrange_default          (GstPad *pad);
-GstCaps*            gst_proxy_pad_getcaps_default                (GstPad *pad);
+GstCaps*            gst_proxy_pad_getcaps_default                (GstPad *pad, GstCaps * filter);
 gboolean            gst_proxy_pad_acceptcaps_default             (GstPad *pad, GstCaps *caps);
 void                gst_proxy_pad_fixatecaps_default             (GstPad *pad, GstCaps *caps);
 gboolean            gst_proxy_pad_setcaps_default                (GstPad *pad, GstCaps *caps);