diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2013-05-09 19:35:29 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2013-05-09 19:36:02 -0400 |
| commit | 1e1e6eaf3f0dd11f6618154d9739cbe3e007d206 (patch) | |
| tree | 09eb721af6ec53626a7fae4d1c4bcad628af1437 | |
| parent | 403c92dac4013332bc434750fb76e314eefc17c3 (diff) | |
streamscombiner: Set the current pad based on latest setcaps0.10
| -rw-r--r-- | gst/encoding/gststreamcombiner.c | 6 |
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; } |