kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 03:04:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 165591 via svnmerge from

Browse Source 
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
This commit is contained in:
Joshua Colp
2008-12-18 17:13:32 +00:00
parent a2c557f3a1
commit 549fcd78a1
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/rtp.c
View File

@@ -2072,10 +2072,9 @@ int ast_rtp_early_bridge(struct ast_channel *c0, struct ast_channel *c1)
else else
destcodec = 0; destcodec = 0;
/* Ensure we have at least one matching codec */ /* Ensure we have at least one matching codec */
if (!(srccodec & destcodec)) { if (srcp && !(srccodec & destcodec)) {
ast_channel_unlock(c0); ast_channel_unlock(c0);
if (c1) ast_channel_unlock(c1);
ast_channel_unlock(c1);
return 0; return 0;
} }
/* Consider empty media as non-existent */ /* Consider empty media as non-existent */