diff options
| author | Joshua Colp <jcolp@digium.com> | 2008-12-18 17:13:32 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2008-12-18 17:13:32 +0000 |
| commit | 549fcd78a1856a17e8936d458185cac3cb28937b (patch) | |
| tree | 9bf951bc5f22140e47c68e5b110ab39e1623a61f | |
| parent | a2c557f3a1fa4c2bc0ba127a1d59f58df637ed66 (diff) | |
Merged revisions 165591 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r165591 | file | 2008-12-18 13:11:42 -0400 (Thu, 18 Dec 2008) | 4 lines
Only care about a compatible codec for early bridging if we are actually bridging to another channel. If we are not we actually want to bring the audio back to us.
(closes issue #13545)
Reported by: davidw
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@165599 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | main/rtp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/main/rtp.c b/main/rtp.c index c613aac17..904944359 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -2072,10 +2072,9 @@ int ast_rtp_early_bridge(struct ast_channel *c0, struct ast_channel *c1) else destcodec = 0; /* Ensure we have at least one matching codec */ - if (!(srccodec & destcodec)) { + if (srcp && !(srccodec & destcodec)) { ast_channel_unlock(c0); - if (c1) - ast_channel_unlock(c1); + ast_channel_unlock(c1); return 0; } /* Consider empty media as non-existent */ |