From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Tue, 6 Sep 2011 13:31:53 +0000 (+0200)
Subject: Merge branch 'master' into 0.11
X-Git-Tag: RELEASE-0.11.1~22
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8ee3da5bba6bdfdee316e5eb1e7caf279524ea26;p=platform%2Fupstream%2Fgst-plugins-base.git

Merge branch 'master' into 0.11

Conflicts:
	gst/playback/gstsubtitleoverlay.c
	tests/check/elements/decodebin2.c
---

8ee3da5bba6bdfdee316e5eb1e7caf279524ea26
diff --cc gst/playback/gstsubtitleoverlay.c
index 103388d,66b6565..78ff733
--- a/gst/playback/gstsubtitleoverlay.c
+++ b/gst/playback/gstsubtitleoverlay.c
@@@ -1762,8 -1801,8 +1762,8 @@@ gst_subtitle_overlay_subtitle_sink_getc
  static gboolean
  gst_subtitle_overlay_subtitle_sink_acceptcaps (GstPad * pad, GstCaps * caps)
  {
 -  GstCaps *othercaps = gst_subtitle_overlay_subtitle_sink_getcaps (pad);
 +  GstCaps *othercaps = gst_subtitle_overlay_subtitle_sink_getcaps (pad, NULL);
-   gboolean ret = gst_caps_can_intersect (caps, othercaps);
+   gboolean ret = gst_caps_is_subset (caps, othercaps);
  
    gst_caps_unref (othercaps);