playsinkconvertbin: Use gst_caps_merge() instead of gst_caps_union()

This keeps the caps order and is more efficient.

diff --git a/gst/playback/gstplaysinkconvertbin.c b/gst/playback/gstplaysinkconvertbin.c
index 7039653..1daa7f1 100644 (file)
--- 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;
       }