[svn-commits] rmudgett: trunk r425628 - in /trunk: ./ channels/chan_motif.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Oct 15 14:39:15 2014
New Revision: 425628

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=425628
Log:
chan_motif: Cleanup jingle_tech.capabilities only once.
........

Merged revisions 425627 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/channels/chan_motif.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/channels/chan_motif.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_motif.c?view=diff&rev=425628&r1=425627&r2=425628
==============================================================================
--- trunk/channels/chan_motif.c (original)
+++ trunk/channels/chan_motif.c Wed Oct 15 14:39:15 2014
@@ -2756,7 +2756,6 @@
 	ast_format_cap_append_by_type(jingle_tech.capabilities, AST_MEDIA_TYPE_AUDIO);
 
 	if (aco_process_config(&cfg_info, 0)) {
-		ao2_ref(jingle_tech.capabilities, -1);
 		ast_log(LOG_ERROR, "Unable to read config file motif.conf. Module loaded but not running.\n");
 		aco_info_destroy(&cfg_info);
 		ao2_cleanup(jingle_tech.capabilities);
@@ -2784,7 +2783,6 @@
 	return 0;
 
 end:
-	ao2_cleanup(jingle_tech.capabilities);
 	ast_rtp_glue_unregister(&jingle_rtp_glue);
 
 	if (sched) {