[svn-commits] file: trunk r423256 - in /trunk: ./ res/res_rtp_asterisk.c

[SVN commits to the Digium repositories]

Author: file
Date: Wed Sep 17 13:06:06 2014
New Revision: 423256

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=423256
Log:
res_rtp_asterisk: Ensure that the thread terminating pj stuff is registered.
........

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

Merged revisions 423254 from http://svn.asterisk.org/svn/asterisk/branches/12
........

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

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

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

Modified: trunk/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_rtp_asterisk.c?view=diff&rev=423256&r1=423255&r2=423256
==============================================================================
--- trunk/res/res_rtp_asterisk.c (original)
+++ trunk/res/res_rtp_asterisk.c Wed Sep 17 13:06:06 2014
@@ -5269,6 +5269,8 @@
 #ifdef HAVE_PJPROJECT
 static void rtp_terminate_pjproject(void)
 {
+	pj_thread_register_check();
+
 	if (timer_thread) {
 		timer_terminate = 1;
 		pj_thread_join(timer_thread);