From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Mon, 3 Oct 2011 08:11:19 +0000 (+0200)
Subject: Merge branch 'master' into 0.11
X-Git-Tag: 1.19.3~511^2~7274
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e787c7a5e27bf19edb52faad10d12eae05314b02;p=platform%2Fupstream%2Fgstreamer.git

Merge branch 'master' into 0.11

Conflicts:
	ext/pango/gsttextoverlay.c
	gst/encoding/gstencodebin.c
---

e787c7a5e27bf19edb52faad10d12eae05314b02
diff --cc gst/encoding/gstencodebin.c
index f081a1c,3ce67ff..6f69191
--- a/gst/encoding/gstencodebin.c
+++ b/gst/encoding/gstencodebin.c
@@@ -1062,8 -1066,9 +1062,8 @@@ _create_stream_group (GstEncodeBin * eb
     * If we have no muxer or
     * if the muxer isn't a formatter and doesn't implement the tagsetter interface
     */
 -  if (!ebin->muxer
 -      || (!gst_element_implements_interface (ebin->muxer, GST_TYPE_TAG_SETTER)
 +  if (!ebin->muxer || (!GST_IS_TAG_SETTER (ebin->muxer)
-           || !_has_class (ebin->muxer, "Formatter"))) {
+           && !_has_class (ebin->muxer, "Formatter"))) {
      sgroup->formatter = _get_formatter (ebin, sprof);
      if (sgroup->formatter) {
        GST_DEBUG ("Adding formatter for %" GST_PTR_FORMAT, format);