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

[SVN commits to the Asterisk project]

Author: irroot
Date: Wed Jun  8 07:23:33 2011
New Revision: 322406

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=322406
Log:
Cleanup format change in sip

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=322406&r1=322405&r2=322406
==============================================================================
--- team/irroot/distrotech-customers-1.8/channels/chan_sip.c (original)
+++ team/irroot/distrotech-customers-1.8/channels/chan_sip.c Wed Jun  8 07:23:33 2011
@@ -6299,16 +6299,14 @@
 		if (!(frame->subclass.codec & ast->nativeformats)) {
 			struct ast_channel *bridge;
 			char s1[512], s2[512], s3[512];
-
 			ast_log(LOG_WARNING, "Asked to transmit frame type %s, while native formats is %s read/write = %s/%s\n",
 				ast_getformatname(frame->subclass.codec),
 				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);
 				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);