summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gst/encoding/gststreamcombiner.c6
1 files changed, 6 insertions, 0 deletions
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;
}