mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 17:50:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

playsinkconvertbin: Use gst_caps_merge() instead of gst_caps_union()

Browse source 
This keeps the caps order and is more efficient.
This commit is contained in:
Sebastian Dröge 2011-11-04 10:36:51 +01:00
parent 7559fb29a4
commit 6e9a302eca
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/playback/gstplaysinkconvertbin.c
View file

@ -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;
}