[asterisk-commits] kmoore: branch kmoore/say_alpha_tweaks r397429 - in /team/kmoore/say_alpha_tw...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Thu Aug 22 12:02:44 2013
New Revision: 397429

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=397429
Log:
Bring up to current

Modified:
    team/kmoore/say_alpha_tweaks/   (props changed)
    team/kmoore/say_alpha_tweaks/main/bridge.c

Propchange: team/kmoore/say_alpha_tweaks/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Aug 22 12:02:44 2013
@@ -1,1 +1,1 @@
-/trunk:1-397417
+/trunk:1-397428

Modified: team/kmoore/say_alpha_tweaks/main/bridge.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/say_alpha_tweaks/main/bridge.c?view=diff&rev=397429&r1=397428&r2=397429
==============================================================================
--- team/kmoore/say_alpha_tweaks/main/bridge.c (original)
+++ team/kmoore/say_alpha_tweaks/main/bridge.c Thu Aug 22 12:02:44 2013
@@ -1411,7 +1411,11 @@
 	ast_bridge_channel_lock_bridge(bridge_channel);
 	bridge = bridge_channel->bridge;
 	if (bridge_channel == bridge_find_channel(bridge, chan)) {
-/* BUGBUG this needs more work.  The channels need to be made compatible again if the formats change. The bridge_channel thread needs to monitor for this case. */
+/*
+ * XXX ASTERISK-22366 this needs more work.  The channels need
+ * to be made compatible again if the formats change. The
+ * bridge_channel thread needs to monitor for this case.
+ */
 		/* The channel we want to notify is still in a bridge. */
 		bridge->v_table->notify_masquerade(bridge, bridge_channel);
 		bridge_reconfigured(bridge, 1);