mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-03 10:43:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Wim Taymans 2011-11-11 19:36:23 +01:00
commit 2886955d18
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gst/playback/gstplaysinkconvertbin.c
View file

@ -387,6 +387,7 @@ gst_play_sink_convert_bin_getcaps (GstPad * pad, GstCaps * filter)
GstCaps *peer_caps = gst_pad_get_caps (peer, filter); GstCaps *peer_caps = gst_pad_get_caps (peer, filter);
gst_object_unref (peer); gst_object_unref (peer);
if (self->converter_caps) { if (self->converter_caps) {
peer_caps = gst_caps_make_writable (peer_caps);
gst_caps_merge (peer_caps, gst_caps_ref (self->converter_caps)); gst_caps_merge (peer_caps, gst_caps_ref (self->converter_caps));
ret = peer_caps; ret = peer_caps;
} else { } else {