[asterisk-commits] wdoekes: trunk r396996 - in /trunk: ./ configs/

[SVN commits to the Asterisk project]

Author: wdoekes
Date: Tue Aug 20 06:48:57 2013
New Revision: 396996

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=396996
Log:
Add "autoframing" option to sip.conf.sample and h323.conf.sample.

The autoframing option was added to chan_sip.c in r43243 (mogorman,
2006-09-19 01:32:57), but never made its way into the sample configs.

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

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

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

Modified:
    trunk/   (props changed)
    trunk/configs/h323.conf.sample
    trunk/configs/sip.conf.sample

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

Modified: trunk/configs/h323.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/h323.conf.sample?view=diff&rev=396996&r1=396995&r2=396996
==============================================================================
--- trunk/configs/h323.conf.sample (original)
+++ trunk/configs/h323.conf.sample Tue Aug 20 06:48:57 2013
@@ -29,6 +29,8 @@
 ;allow=gsm		; Always allow GSM, it's cool :)
 ;allow=ulaw		; see https://wiki.asterisk.org/wiki/display/AST/RTP+Packetization
 			; for framing options
+;autoframing=yes	; Set packetization based on the remote endpoint's (ptime)
+			; preferences. Defaults to no.
 ;
 ; User-Input Mode (DTMF)
 ;

Modified: trunk/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/sip.conf.sample?view=diff&rev=396996&r1=396995&r2=396996
==============================================================================
--- trunk/configs/sip.conf.sample (original)
+++ trunk/configs/sip.conf.sample Tue Aug 20 06:48:57 2013
@@ -310,6 +310,8 @@
 ;allow=ulaw                     ; Allow codecs in order of preference
 ;allow=ilbc                     ; see https://wiki.asterisk.org/wiki/display/AST/RTP+Packetization
 				; for framing options
+;autoframing=yes		; Set packetization based on the remote endpoint's (ptime)
+				; preferences. Defaults to no.
 ;
 ; This option specifies a preference for which music on hold class this channel
 ; should listen to when put on hold if the music class has not been set on the
@@ -1205,6 +1207,7 @@
 ; language
 ; allow
 ; disallow
+; autoframing
 ; insecure
 ; trustrpid
 ; progressinband