[asterisk-commits] kmoore: trunk r388598 - in /trunk: ./ res/res_srtp.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Mon May 13 15:37:11 2013
New Revision: 388598

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=388598
Log:
Revert r388529 for now

Adding the cleanup function needs some deeper thought since it
apparently doesn't exist for all variants of libsrtp.
........

Merged revisions 388596 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 388597 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/res/res_srtp.c

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

Modified: trunk/res/res_srtp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_srtp.c?view=diff&rev=388598&r1=388597&r2=388598
==============================================================================
--- trunk/res/res_srtp.c (original)
+++ trunk/res/res_srtp.c Mon May 13 15:37:11 2013
@@ -546,7 +546,6 @@
 {
 	srtp_install_event_handler(NULL);
 	ast_rtp_engine_unregister_srtp();
-	srtp_shutdown();
 	g_initialized = 0;
 }