[asterisk-commits] irroot: branch irroot/distrotech-customers-1.8 r323104 - /team/irroot/distrot...

[SVN commits to the Asterisk project]

Author: irroot
Date: Mon Jun 13 05:19:38 2011
New Revision: 323104

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=323104
Log:
Rework format update in sip_write

Modified:
    team/irroot/distrotech-customers-1.8/channels/chan_sip.c

Modified: team/irroot/distrotech-customers-1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/channels/chan_sip.c?view=diff&rev=323104&r1=323103&r2=323104
==============================================================================
--- team/irroot/distrotech-customers-1.8/channels/chan_sip.c (original)
+++ team/irroot/distrotech-customers-1.8/channels/chan_sip.c Mon Jun 13 05:19:38 2011
@@ -6304,9 +6304,9 @@
 				ast_getformatname_multiple(s1, sizeof(s1), ast->nativeformats & AST_FORMAT_AUDIO_MASK),
 				ast_getformatname_multiple(s2, sizeof(s2), ast->readformat),
 				ast_getformatname_multiple(s3, sizeof(s3), ast->writeformat));
+			ast_set_write_format(ast, frame->subclass.codec);
 			bridge = ast_bridged_channel(ast);
-			if (!ast_channel_trylock(bridge)) {
-				ast_set_write_format(ast, frame->subclass.codec);
+			if (bridge && !ast_channel_trylock(bridge)) {
 				ast_log(LOG_WARNING, "Attempting to change formats making %s and %s compat.\n", ast->name, bridge->name);
 				ast_channel_make_compatible(ast, bridge);
 				ast_channel_unlock(bridge);