From 1e1e6eaf3f0dd11f6618154d9739cbe3e007d206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Thu, 9 May 2013 19:35:29 -0400 Subject: streamscombiner: Set the current pad based on latest setcaps --- gst/encoding/gststreamcombiner.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gst/encoding/gststreamcombiner.c b/gst/encoding/gststreamcombiner.c index c601cf881..28e0ac62c 100644 --- a/gst/encoding/gststreamcombiner.c +++ b/gst/encoding/gststreamcombiner.c @@ -154,8 +154,14 @@ gst_stream_combiner_sink_setcaps (GstPad * pad, GstCaps * caps) GST_DEBUG_OBJECT (peer, "Setting caps"); res = gst_pad_set_caps (peer, caps); gst_object_unref (peer); + + STREAMS_LOCK (stream_combiner); + if (res) + stream_combiner->current = pad; + STREAMS_UNLOCK (stream_combiner); } else GST_WARNING_OBJECT (stream_combiner, "sourcepad has no peer !"); + return res; } -- cgit v1.2.1