Merge branch 'master' into 0.11

Conflicts:
	libs/gst/base/gstbaseparse.c

diff --cc gst/gst.h
Simple merge

diff --cc libs/gst/base/gstbaseparse.c
index ed4c890,699b191..93949d4
--- 1/libs/gst/base/gstbaseparse.c
--- 2/libs/gst/base/gstbaseparse.c
+++ b/libs/gst/base/gstbaseparse.c
@@@ -3167,21 -3148,21 +3167,21 @@@ gst_base_parse_query (GstPad * pad, Gst
        GST_DEBUG_OBJECT (parse, "position query");
        gst_query_parse_position (query, &format, NULL);
  
-       GST_OBJECT_LOCK (parse);
-       if (format == GST_FORMAT_BYTES) {
-         dest_value = parse->priv->offset;
-         res = TRUE;
-       } else if (format == parse->segment.format &&
-           GST_CLOCK_TIME_IS_VALID (parse->segment.position)) {
-         dest_value = parse->segment.position;
-         res = TRUE;
-       }
-       GST_OBJECT_UNLOCK (parse);
- 
-       if (res)
-         gst_query_set_position (query, format, dest_value);
-       else {
-         res = gst_pad_query_default (pad, query);
+       /* try upstream first */
+       res = gst_pad_query_default (pad, query);
+       if (!res) {
+         /* Fall back on interpreting segment */
+         GST_OBJECT_LOCK (parse);
+         if (format == GST_FORMAT_BYTES) {
+           dest_value = parse->priv->offset;
+           res = TRUE;
+         } else if (format == parse->segment.format &&
 -            GST_CLOCK_TIME_IS_VALID (parse->segment.last_stop)) {
++            GST_CLOCK_TIME_IS_VALID (parse->segment.position)) {
+           dest_value = gst_segment_to_stream_time (&parse->segment,
 -              parse->segment.format, parse->segment.last_stop);
++              parse->segment.format, parse->segment.position);
+           res = TRUE;
+         }
+         GST_OBJECT_UNLOCK (parse);
          if (!res) {
            /* no precise result, upstream no idea either, then best estimate */
            /* priv->offset is updated in both PUSH/PULL modes */

diff --cc tests/check/Makefile.am
index 43aac86,8b6dfff..b39d89e
--- 1/tests/check/Makefile.am
--- 2/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@@ -98,9 -95,9 +98,10 @@@ endi
  
  check_PROGRAMS =                              \
        $(ABI_CHECKS)                           \
+       gst/gstatomicqueue                      \
        gst/gstbuffer                           \
        gst/gstbufferlist                       \
 +      gst/gstmeta                             \
        gst/gstbus                              \
        gst/gstcaps                             \
        $(CXX_CHECKS)                           \

diff --cc tests/check/gst/.gitignore
Simple merge