playsinkconvertbin: Only return the converter caps if we actually have raw caps
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 28 Nov 2011 18:03:54 +0000 (19:03 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 28 Nov 2011 18:03:54 +0000 (19:03 +0100)
Fixes bug #664818 (hopefully).

gst/playback/gstplaysinkconvertbin.c

index 361b5d2..4f707d7 100644 (file)
@@ -391,7 +391,7 @@ gst_play_sink_convert_bin_getcaps (GstPad * pad)
     if (peer) {
       GstCaps *peer_caps = gst_pad_get_caps_reffed (peer);
       gst_object_unref (peer);
-      if (self->converter_caps) {
+      if (self->converter_caps && is_raw_caps (peer_caps)) {
         peer_caps = gst_caps_make_writable (peer_caps);
         gst_caps_merge (peer_caps, gst_caps_ref (self->converter_caps));
         ret = peer_caps;