From c1b1e2b44e59ba79100c70eeee964dde8b48750c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 28 Nov 2011 19:03:54 +0100 Subject: [PATCH] playsinkconvertbin: Only return the converter caps if we actually have raw caps Fixes bug #664818 (hopefully). --- gst/playback/gstplaysinkconvertbin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gst/playback/gstplaysinkconvertbin.c b/gst/playback/gstplaysinkconvertbin.c index 361b5d2..4f707d7 100644 --- 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; -- 2.7.4