Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
	gst/audioparsers/gstmpegaudioparse.c

diff --cc gst/audioparsers/gstmpegaudioparse.c
Simple merge

diff --cc gst/flv/gstflvmux.c
Simple merge

diff --cc gst/isomp4/gstqtmux.c
index d06cbc8,80fa5af..e51f48c
--- 1/gst/isomp4/gstqtmux.c
--- 2/gst/isomp4/gstqtmux.c
+++ b/gst/isomp4/gstqtmux.c
@@@ -1629,9 -1613,33 +1629,33 @@@ gst_qt_mux_start_file (GstQTMux * qtmux
    gst_pad_set_caps (qtmux->srcpad, caps);
    gst_caps_unref (caps);
  
+   /* if not streaming, check if downstream is seekable */
+   if (!qtmux->streamable) {
+     gboolean seekable;
+     GstQuery *query;
+ 
+     query = gst_query_new_seeking (GST_FORMAT_BYTES);
+     if (gst_pad_peer_query (qtmux->srcpad, query)) {
+       gst_query_parse_seeking (query, NULL, &seekable, NULL, NULL);
+       GST_INFO_OBJECT (qtmux, "downstream is %sseekable",
+           seekable ? "" : "not ");
+       if (!seekable) {
+         qtmux->streamable = TRUE;
+         g_object_notify (G_OBJECT (qtmux), "streamable");
+         GST_WARNING_OBJECT (qtmux, "downstream is not seekable, but "
+             "streamable=false. Will ignore that and create streamable output "
+             "instead");
+       }
+     } else {
+       /* have to assume seeking is supported if query not handled downstream */
+       /* FIXME 0.11: change to query not handled => seeking not supported */
+       GST_WARNING_OBJECT (qtmux, "downstream did not handle seeking query");
+     }
+   }
+ 
    /* let downstream know we think in BYTES and expect to do seeking later on */
 -  gst_pad_push_event (qtmux->srcpad,
 -      gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_BYTES, 0, -1, 0));
 +  gst_segment_init (&segment, GST_FORMAT_BYTES);
 +  gst_pad_push_event (qtmux->srcpad, gst_event_new_segment (&segment));
  
    /* initialize our moov recovery file */
    GST_OBJECT_LOCK (qtmux);

diff --cc gst/matroska/matroska-mux.c
index f2d3d54,fb86ef4..e7c42f3
--- 1/gst/matroska/matroska-mux.c
--- 2/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@@ -2340,10 -2355,33 +2340,33 @@@ gst_matroska_mux_start (GstMatroskaMux 
    guint32 segment_uid[4];
    GTimeVal time = { 0, 0 };
  
+   /* if not streaming, check if downstream is seekable */
+   if (!mux->streamable) {
+     gboolean seekable;
+     GstQuery *query;
+ 
+     query = gst_query_new_seeking (GST_FORMAT_BYTES);
+     if (gst_pad_peer_query (mux->srcpad, query)) {
+       gst_query_parse_seeking (query, NULL, &seekable, NULL, NULL);
+       GST_INFO_OBJECT (mux, "downstream is %sseekable", seekable ? "" : "not ");
+       if (!seekable) {
+         mux->streamable = TRUE;
+         g_object_notify (G_OBJECT (mux), "streamable");
+         GST_WARNING_OBJECT (mux, "downstream is not seekable, but "
+             "streamable=false. Will ignore that and create streamable output "
+             "instead");
+       }
+     } else {
+       /* have to assume seeking is supported if query not handled downstream */
+       /* FIXME 0.11: change to query not handled => seeking not supported */
+       GST_WARNING_OBJECT (mux, "downstream did not handle seeking query");
+     }
+   }
+ 
    if (!strcmp (mux->doctype, GST_MATROSKA_DOCTYPE_WEBM)) {
 -    ebml->caps = gst_caps_new_simple ("video/webm", NULL);
 +    ebml->caps = gst_caps_new_empty_simple ("video/webm");
    } else {
 -    ebml->caps = gst_caps_new_simple ("video/x-matroska", NULL);
 +    ebml->caps = gst_caps_new_empty_simple ("video/x-matroska");
    }
    /* we start with a EBML header */
    doctype = mux->doctype;