[svn-commits] file: trunk r165599 - in /trunk: ./ main/rtp.c

[SVN commits to the Digium repositories]

Author: file
Date: Thu Dec 18 11:13:32 2008
New Revision: 165599

URL: http://svn.digium.com/view/asterisk?view=rev&rev=165599
Log:
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
........

Modified:
    trunk/   (props changed)
    trunk/main/rtp.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/rtp.c
URL: http://svn.digium.com/view/asterisk/trunk/main/rtp.c?view=diff&rev=165599&r1=165598&r2=165599
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Thu Dec 18 11:13:32 2008
@@ -2072,10 +2072,9 @@
 	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 */