diff options
author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-05-28 14:01:17 +0200 |
---|---|---|
committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-05-28 14:01:17 +0200 |
commit | d46e459f22750d9e298286ea0815328d0ae96821 (patch) | |
tree | 019d82466c3553277aab415b41927991f97dc6ee /gst/videomixer/videomixer.c | |
parent | a5c30ae5028d054c5a3c4014d0eda1ea92d05b1f (diff) |
videomixer: Don't use // comments
Diffstat (limited to 'gst/videomixer/videomixer.c')
-rw-r--r-- | gst/videomixer/videomixer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c index fd3e74ba..2d1ad190 100644 --- a/gst/videomixer/videomixer.c +++ b/gst/videomixer/videomixer.c @@ -360,7 +360,7 @@ gst_videomixer_pad_sink_acceptcaps (GstPad * pad, GstCaps * vscaps) GstCaps *caps1 = gst_caps_copy (acceptedCaps); GstCaps *caps2 = gst_caps_copy_nth (gst_pad_get_pad_template_caps (pad), i); - gst_caps_merge (caps1, caps2); //caps2 is unrefed + gst_caps_merge (caps1, caps2); gst_caps_do_simplify (caps1); if (GST_CAPS_IS_SIMPLE (caps1)) { gst_caps_replace (&acceptedCaps, caps1); |