From 7333579bf97f6d8ea70b19f695e524ffd8dd9ce9 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Thu, 18 Dec 2008 17:14:27 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165603 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/rtp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/main/rtp.c b/main/rtp.c index 840b2a9951..8fff9544a1 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 */