[asterisk-commits] oej: branch oej/teapot-1.8 r402890 - /team/oej/teapot-1.8/res/res_rtp_asterisk.c

[SVN commits to the Asterisk project]

Author: oej
Date: Tue Nov 19 09:39:13 2013
New Revision: 402890

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=402890
Log:
Restore the p2pbridge patch

Modified:
    team/oej/teapot-1.8/res/res_rtp_asterisk.c

Modified: team/oej/teapot-1.8/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/teapot-1.8/res/res_rtp_asterisk.c?view=diff&rev=402890&r1=402889&r2=402890
==============================================================================
--- team/oej/teapot-1.8/res/res_rtp_asterisk.c (original)
+++ team/oej/teapot-1.8/res/res_rtp_asterisk.c Tue Nov 19 09:39:13 2013
@@ -2644,8 +2644,10 @@
 
 	/* This needs to be after RTCP calculations to get more RTCP data */
 	/* If we are directly bridged to another instance send the audio directly out */
-	if (ast_rtp_instance_get_bridged(instance) && !bridge_p2p_rtp_write(instance, rtpheader, res, hdrlen)) {
-		return &ast_null_frame;
+	if (p2pbridge) {
+		if (ast_rtp_instance_get_bridged(instance) && !bridge_p2p_rtp_write(instance, rtpheader, res, hdrlen)) {
+			return &ast_null_frame;
+		}
 	}
 
 	/* Remove any padding bytes that may be present */