Merge branch 'master' into 0.11

diff --cc ext/ogg/gstoggmux.c
index 0a1d3e0eeb2cd291e64f193170fb5b43863283ce,58dd85f8070777a53f0d2fe46e44dbe597ff8639..dde10fbfa9d2ee675309dfb89069127582861bed
--- 1/ext/ogg/gstoggmux.c
--- 2/ext/ogg/gstoggmux.c
+++ b/ext/ogg/gstoggmux.c
@@@ -114,10 -114,13 +114,10 @@@ static GstStaticPadTemplate sink_factor
  static void gst_ogg_mux_finalize (GObject * object);
  
  static GstFlowReturn
- gst_ogg_mux_collected (GstCollectPads * pads, GstOggMux * ogg_mux);
+ gst_ogg_mux_collected (GstCollectPads2 * pads, GstOggMux * ogg_mux);
  static gboolean gst_ogg_mux_handle_src_event (GstPad * pad, GstEvent * event);
  static GstPad *gst_ogg_mux_request_new_pad (GstElement * element,
 -    GstPadTemplate * templ, const gchar * name);
 +    GstPadTemplate * templ, const gchar * name, const GstCaps * caps);
  static void gst_ogg_mux_release_pad (GstElement * element, GstPad * pad);
  
  static void gst_ogg_mux_set_property (GObject * object,

diff --cc gst/typefind/gsttypefindfunctions.c
Simple merge