Commit 2886955d authored by Wim Taymans's avatar Wim Taymans
Browse files

Merge branch 'master' into 0.11

parents bdf38454 7b5e1666
......@@ -387,6 +387,7 @@ gst_play_sink_convert_bin_getcaps (GstPad * pad, GstCaps * filter)
GstCaps *peer_caps = gst_pad_get_caps (peer, filter);
gst_object_unref (peer);
if (self->converter_caps) {
peer_caps = gst_caps_make_writable (peer_caps);
gst_caps_merge (peer_caps, gst_caps_ref (self->converter_caps));
ret = peer_caps;
} else {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment