[asterisk-commits] dvossel: branch dvossel/fixtheworld_phase1_step3 r301782 - /team/dvossel/fixt...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Jan 13 17:10:50 2011
New Revision: 301782

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=301782
Log:
more usage of ast_cap_copy2

Modified:
    team/dvossel/fixtheworld_phase1_step3/main/rtp_engine.c
    team/dvossel/fixtheworld_phase1_step3/main/translate.c

Modified: team/dvossel/fixtheworld_phase1_step3/main/rtp_engine.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step3/main/rtp_engine.c?view=diff&rev=301782&r1=301781&r2=301782
==============================================================================
--- team/dvossel/fixtheworld_phase1_step3/main/rtp_engine.c (original)
+++ team/dvossel/fixtheworld_phase1_step3/main/rtp_engine.c Thu Jan 13 17:10:50 2011
@@ -1142,8 +1142,7 @@
 			ast_sockaddr_copy(&ac1, &t1);
 			ast_sockaddr_copy(&vac1, &vt1);
 			ast_sockaddr_copy(&tac1, &tt1);
-			ast_cap_remove_all(oldcap1);
-			ast_cap_append(oldcap1, cap1);
+			ast_cap_copy2(oldcap1, cap1);
 		}
 		if ((ast_sockaddr_cmp(&t0, &ac0)) ||
 		    (vinstance0 && ast_sockaddr_cmp(&vt0, &vac0)) ||
@@ -1165,8 +1164,7 @@
 			ast_sockaddr_copy(&ac0, &t0);
 			ast_sockaddr_copy(&vac0, &vt0);
 			ast_sockaddr_copy(&tac0, &tt0);
-			ast_cap_remove_all(oldcap0);
-			ast_cap_append(oldcap0, cap0);
+			ast_cap_copy2(oldcap0, cap0);
 		}
 
 		/* Wait for frame to come in on the channels */

Modified: team/dvossel/fixtheworld_phase1_step3/main/translate.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step3/main/translate.c?view=diff&rev=301782&r1=301781&r2=301782
==============================================================================
--- team/dvossel/fixtheworld_phase1_step3/main/translate.c (original)
+++ team/dvossel/fixtheworld_phase1_step3/main/translate.c Thu Jan 13 17:10:50 2011
@@ -1258,8 +1258,8 @@
 	int src_audio = 0;
 	int src_video = 0;
 	int index;
-	ast_cap_remove_all(result);
-	ast_cap_append(result, dest);
+
+	ast_cap_copy2(result, dest);
 
 	/* if we don't have a source format, we just have to try all
 	   possible destination formats */