[asterisk-commits] coreyfarrell: branch group/media_formats-reviewed-trunk r418065 - in /team/gr...

[SVN commits to the Asterisk project]

Author: coreyfarrell
Date: Sat Jul  5 11:41:33 2014
New Revision: 418065

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418065
Log:
Fix some issues from r3689 (the great rename)

chan_mgcp: buf unused variable prevents devmode build
chan_skinny / chan_unistim: tech.capabilities double ao2_cleanup
format_cap: ao2_ref(framed, +1) was mistakenly removed, causing many fracks

Review: https://reviewboard.asterisk.org/r/3713/

Modified:
    team/group/media_formats-reviewed-trunk/channels/chan_mgcp.c
    team/group/media_formats-reviewed-trunk/channels/chan_skinny.c
    team/group/media_formats-reviewed-trunk/channels/chan_unistim.c
    team/group/media_formats-reviewed-trunk/main/format_cap.c

Modified: team/group/media_formats-reviewed-trunk/channels/chan_mgcp.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats-reviewed-trunk/channels/chan_mgcp.c?view=diff&rev=418065&r1=418064&r2=418065
==============================================================================
--- team/group/media_formats-reviewed-trunk/channels/chan_mgcp.c (original)
+++ team/group/media_formats-reviewed-trunk/channels/chan_mgcp.c Sat Jul  5 11:41:33 2014
@@ -1251,7 +1251,6 @@
 {
 	struct mgcp_subchannel *sub = ast_channel_tech_pvt(ast);
 	int res = 0;
-	char buf[256];
 
 	if (frame->frametype != AST_FRAME_VOICE) {
 		if (frame->frametype == AST_FRAME_IMAGE)

Modified: team/group/media_formats-reviewed-trunk/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats-reviewed-trunk/channels/chan_skinny.c?view=diff&rev=418065&r1=418064&r2=418065
==============================================================================
--- team/group/media_formats-reviewed-trunk/channels/chan_skinny.c (original)
+++ team/group/media_formats-reviewed-trunk/channels/chan_skinny.c Sat Jul  5 11:41:33 2014
@@ -8779,7 +8779,6 @@
 		ast_context_destroy(con, "Skinny");
 
 	ao2_ref(default_cap, -1);
-	ao2_ref(skinny_tech.capabilities, -1);
 	return 0;
 }
 

Modified: team/group/media_formats-reviewed-trunk/channels/chan_unistim.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats-reviewed-trunk/channels/chan_unistim.c?view=diff&rev=418065&r1=418064&r2=418065
==============================================================================
--- team/group/media_formats-reviewed-trunk/channels/chan_unistim.c (original)
+++ team/group/media_formats-reviewed-trunk/channels/chan_unistim.c Sat Jul  5 11:41:33 2014
@@ -7140,7 +7140,6 @@
 		close(unistimsock);
 	}
 	ao2_ref(global_cap, -1);
-	ao2_ref(unistim_tech.capabilities, -1);
 
 	return 0;
 }

Modified: team/group/media_formats-reviewed-trunk/main/format_cap.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats-reviewed-trunk/main/format_cap.c?view=diff&rev=418065&r1=418064&r2=418065
==============================================================================
--- team/group/media_formats-reviewed-trunk/main/format_cap.c (original)
+++ team/group/media_formats-reviewed-trunk/main/format_cap.c Sat Jul  5 11:41:33 2014
@@ -159,6 +159,7 @@
 	list = AST_VECTOR_GET_ADDR(&cap->formats, ast_format_get_codec_id(format));
 
 	/* Order doesn't matter for formats, so insert at the head for performance reasons */
+	ao2_ref(framed, +1);
 	AST_LIST_INSERT_HEAD(list, framed, entry);
 
 	/* This takes the allocation reference */