diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-11-07 16:04:26 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-11-07 16:04:26 -0600 |
| commit | a4d145e4654ec09897d462346ea663956729c15c (patch) | |
| tree | 130be1d730c3fc47f5743b701e37ad0b21052134 | |
| parent | 51ff8e3899df1f0086932abfcb5235ace3c9fe13 (diff) | |
| parent | 62d60c1f5849a2c4adeafe6be5eccd4fd4ef69d3 (diff) | |
Merge "main/bridge_channel: Fix channel reference leak on video source" into 14
| -rw-r--r-- | main/bridge_channel.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/bridge_channel.c b/main/bridge_channel.c index 18f719506..2142ae7dd 100644 --- a/main/bridge_channel.c +++ b/main/bridge_channel.c @@ -2772,6 +2772,9 @@ int bridge_channel_internal_join(struct ast_bridge_channel *bridge_channel) bridge_channel_settle_owed_events(bridge_channel->bridge, bridge_channel); bridge_reconfigured(bridge_channel->bridge, 1); + /* Remove ourselves if we are the video source */ + ast_bridge_remove_video_src(bridge_channel->bridge, bridge_channel->chan); + ast_bridge_unlock(bridge_channel->bridge); /* Must release any swap ref after unlocking the bridge. */ |