[asterisk-commits] dvossel: branch dvossel/fixtheworld_phase1_step3 r302317 - in /team/dvossel/f...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Tue Jan 18 16:01:17 2011
New Revision: 302317

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=302317
Log:
fixes a couple of issues with comparing native formats

Modified:
    team/dvossel/fixtheworld_phase1_step3/channels/chan_iax2.c
    team/dvossel/fixtheworld_phase1_step3/main/channel.c

Modified: team/dvossel/fixtheworld_phase1_step3/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step3/channels/chan_iax2.c?view=diff&rev=302317&r1=302316&r2=302317
==============================================================================
--- team/dvossel/fixtheworld_phase1_step3/channels/chan_iax2.c (original)
+++ team/dvossel/fixtheworld_phase1_step3/channels/chan_iax2.c Tue Jan 18 16:01:17 2011
@@ -5571,7 +5571,7 @@
 			}
 			return AST_BRIDGE_FAILED_NOWARN;
 		}
-		if (c0->nativeformats != c1->nativeformats) {
+		if (!(ast_format_cap_identical(c0->nativeformats, c1->nativeformats))) {
 			char buf0[256];
 			char buf1[256];
 			ast_getformatname_multiple(buf0, sizeof(buf0), c0->nativeformats);

Modified: team/dvossel/fixtheworld_phase1_step3/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step3/main/channel.c?view=diff&rev=302317&r1=302316&r2=302317
==============================================================================
--- team/dvossel/fixtheworld_phase1_step3/main/channel.c (original)
+++ team/dvossel/fixtheworld_phase1_step3/main/channel.c Tue Jan 18 16:01:17 2011
@@ -6588,7 +6588,7 @@
 	ast_channel_set_fd(original, AST_TIMING_FD, original->timingfd);
 
 	/* Our native formats are different now */
-	original->nativeformats = clonechan->nativeformats;
+	ast_format_cap_copy2(original->nativeformats, clonechan->nativeformats);
 
 	/* Context, extension, priority, app data, jump table,  remain the same */
 	/* pvt switches.  pbx stays the same, as does next */