playsinkconvertbin: Only return the converter caps if we actually have raw caps

Fixes bug #664818 (hopefully).

diff --git a/gst/playback/gstplaysinkconvertbin.c b/gst/playback/gstplaysinkconvertbin.c
index 361b5d20c1cc5ee3948e8d57153a649c9635f4e9..4f707d7d1fab0445e71ab33cf664e3d0e7257264 100644 (file)
--- a/gst/playback/gstplaysinkconvertbin.c
+++ b/gst/playback/gstplaysinkconvertbin.c
@@ -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;