[asterisk-commits] irroot: branch irroot/distrotech-customers-trunk r321665 - in /team/irroot/di...

[SVN commits to the Asterisk project]

Author: irroot
Date: Fri Jun  3 02:42:38 2011
New Revision: 321665

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=321665
Log:
automerge enable

Modified:
    team/irroot/distrotech-customers-trunk/   (props changed)
    team/irroot/distrotech-customers-trunk/channels/chan_local.c

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
    automerge = *

Modified: team/irroot/distrotech-customers-trunk/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/chan_local.c?view=diff&rev=321665&r1=321664&r2=321665
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_local.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_local.c Fri Jun  3 02:42:38 2011
@@ -598,8 +598,8 @@
 	/* Just queue for delivery to the other side */
 	ao2_ref(p, 1); /* ref for local_queue_frame */
 	ao2_lock(p);
-
 	isoutbound = IS_OUTBOUND(ast, p);
+
 	if (isoutbound && f && (f->frametype == AST_FRAME_VOICE || f->frametype == AST_FRAME_VIDEO)) {
 		check_bridge(p);
 	} else if (!isoutbound) {