Merge branch 'master' into 0.11

Conflicts:
	ext/ogg/gstoggmux.c

diff --cc ext/ogg/gstoggdemux.c
Simple merge

diff --cc ext/ogg/gstoggmux.c
index 283505c,5341d6c..922409b
--- 1/ext/ogg/gstoggmux.c
--- 2/ext/ogg/gstoggmux.c
+++ b/ext/ogg/gstoggmux.c
@@@ -105,27 -104,15 +105,27 @@@ static GstStaticPadTemplate video_sink_
      GST_PAD_SINK,
      GST_PAD_REQUEST,
      GST_STATIC_CAPS ("video/x-theora; "
 -        "audio/x-vorbis; audio/x-flac; audio/x-speex; audio/x-celt; "
 -        "application/x-ogm-video; application/x-ogm-audio; video/x-dirac; "
 -        "video/x-smoke; video/x-vp8; text/x-cmml, encoded = (boolean) TRUE; "
 -        "subtitle/x-kate; application/x-kate; audio/x-opus")
 +        "application/x-ogm-video; video/x-dirac; "
 +        "video/x-smoke; video/x-vp8; ")
 +    );
 +
 +static GstStaticPadTemplate audio_sink_factory =
 +    GST_STATIC_PAD_TEMPLATE ("audio_%u",
 +    GST_PAD_SINK,
 +    GST_PAD_REQUEST,
 +    GST_STATIC_CAPS
 +    ("audio/x-vorbis; audio/x-flac; audio/x-speex; audio/x-celt; "
-         "application/x-ogm-audio; ")
++        "application/x-ogm-audio; audio/x-opus")
 +    );
 +
 +static GstStaticPadTemplate subtitle_sink_factory =
 +    GST_STATIC_PAD_TEMPLATE ("subtitle_%u",
 +    GST_PAD_SINK,
 +    GST_PAD_REQUEST,
 +    GST_STATIC_CAPS ("text/x-cmml, encoded = (boolean) TRUE; "
 +        "subtitle/x-kate; application/x-kate")
      );
  
 -static void gst_ogg_mux_base_init (gpointer g_class);
 -static void gst_ogg_mux_class_init (GstOggMuxClass * klass);
 -static void gst_ogg_mux_init (GstOggMux * ogg_mux);
  static void gst_ogg_mux_finalize (GObject * object);
  
  static GstFlowReturn

diff --cc ext/ogg/gstoggstream.c
Simple merge

diff --cc gst/playback/gstplaysinkconvertbin.c
Simple merge