[svn-commits] file: branch 1.6.0 r117576 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: file
Date: Wed May 21 14:45:41 2008
New Revision: 117576

URL: http://svn.digium.com/view/asterisk?view=rev&rev=117576
Log:
Merged revisions 117575 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r117575 | file | 2008-05-21 16:39:42 -0300 (Wed, 21 May 2008) | 10 lines

Merged revisions 117574 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r117574 | file | 2008-05-21 16:38:28 -0300 (Wed, 21 May 2008) | 2 lines

Apply the autoframing setting to dialogs that do not get matched against a user or peer.

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=117576&r1=117575&r2=117576
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Wed May 21 14:45:41 2008
@@ -5791,6 +5791,7 @@
 		if (p->udptl)
 			ast_udptl_setqos(p->udptl, global_tos_audio, global_cos_audio);
 		p->maxcallbitrate = default_maxcallbitrate;
+		p->autoframing = global_autoframing;
 	}
 
 	if (useglobal_nat && sin) {