From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
Date: Mon, 27 Feb 2012 00:08:39 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/master' into 0.11
X-Git-Tag: RELEASE-0.11.3~114
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1fbcc71dbdff79d70b0abe1285f694f3d4596564;p=platform%2Fupstream%2Fgstreamer.git

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

Conflicts:
	NEWS
	RELEASE
	configure.ac
	docs/plugins/gstreamer-plugins.hierarchy
	docs/plugins/inspect/plugin-coreelements.xml
	libs/gst/base/gstcollectpads.c
	libs/gst/base/gstcollectpads2.c
	plugins/elements/gstfdsink.c
	win32/common/config.h
	win32/common/gstenumtypes.c
	win32/common/gstversion.h
---

1fbcc71dbdff79d70b0abe1285f694f3d4596564
diff --cc plugins/elements/gstfdsink.c
index bfe4c71,7667088..3831b09
--- a/plugins/elements/gstfdsink.c
+++ b/plugins/elements/gstfdsink.c
@@@ -193,27 -205,32 +193,37 @@@ gst_fd_sink_query (GstBaseSink * bsink
          case GST_FORMAT_DEFAULT:
          case GST_FORMAT_BYTES:
            gst_query_set_position (query, GST_FORMAT_BYTES, fdsink->current_pos);
 -          return TRUE;
 +          res = TRUE;
 +          break;
          default:
 -          return FALSE;
 +          break;
        }
 -
 +      break;
 +    }
      case GST_QUERY_FORMATS:
        gst_query_set_formats (query, 2, GST_FORMAT_DEFAULT, GST_FORMAT_BYTES);
 -      return TRUE;
 -
 +      res = TRUE;
 +      break;
      case GST_QUERY_URI:
        gst_query_set_uri (query, fdsink->uri);
 -      return TRUE;
 -
 +      res = TRUE;
 +      break;
+     case GST_QUERY_SEEKING:
+       gst_query_parse_seeking (query, &format, NULL, NULL, NULL);
+       if (format == GST_FORMAT_BYTES || format == GST_FORMAT_DEFAULT) {
+         gst_query_set_seeking (query, GST_FORMAT_BYTES, fdsink->seekable, 0,
+             -1);
+       } else {
+         gst_query_set_seeking (query, format, FALSE, 0, -1);
+       }
 -      return TRUE;
 -
++      res = TRUE;
++      break;
      default:
 -      return GST_BASE_SINK_CLASS (parent_class)->query (bsink, query);
 +      res = GST_BASE_SINK_CLASS (parent_class)->query (bsink, query);
 +      break;
 +
    }
 +  return res;
  }
  
  static GstFlowReturn