diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-18 17:14:27 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-18 17:14:27 +0000 |
| commit | 55d62667d2461eaea093b1d6b0400db39edeb11d (patch) | |
| tree | 36d9bc00f9676d0a13c03fdbbd8ef1a9fc564688 /main/rtp.c | |
| parent | 2e633257f5d209af1bcd3071ccf37f3b7a57113a (diff) | |
Merged revisions 165599 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r165599 | file | 2008-12-18 13:13:32 -0400 (Thu, 18 Dec 2008) | 11 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@165603 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/rtp.c')
| -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 840b2a995..8fff9544a 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -1863,10 +1863,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 */ |