From 6e9a302eca9aeaff4debedce2e61fa934e4a8109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 4 Nov 2011 10:36:51 +0100 Subject: [PATCH] playsinkconvertbin: Use gst_caps_merge() instead of gst_caps_union() This keeps the caps order and is more efficient. --- gst/playback/gstplaysinkconvertbin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gst/playback/gstplaysinkconvertbin.c b/gst/playback/gstplaysinkconvertbin.c index 7039653dd5..1daa7f1fca 100644 --- a/gst/playback/gstplaysinkconvertbin.c +++ b/gst/playback/gstplaysinkconvertbin.c @@ -378,8 +378,8 @@ gst_play_sink_convert_bin_getcaps (GstPad * pad) GstCaps *peer_caps = gst_pad_get_caps_reffed (peer); gst_object_unref (peer); if (self->converter_caps) { - ret = gst_caps_union (peer_caps, self->converter_caps); - gst_caps_unref (peer_caps); + gst_caps_merge (peer_caps, gst_caps_ref (self->converter_caps)); + ret = peer_caps; } else { ret = peer_caps; }