[asterisk-commits] oej: branch oej/teapot-1.8 r397032 - in /team/oej/teapot-1.8: ./ configs/

[SVN commits to the Asterisk project]

Author: oej
Date: Tue Aug 20 08:19:17 2013
New Revision: 397032

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=397032
Log:
Resetting conflict caused by autoframing... ;-)

Modified:
    team/oej/teapot-1.8/   (props changed)
    team/oej/teapot-1.8/configs/h323.conf.sample
    team/oej/teapot-1.8/configs/sip.conf.sample

Propchange: team/oej/teapot-1.8/
------------------------------------------------------------------------------
    automerge = Is-there-life-off-net?

Propchange: team/oej/teapot-1.8/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug 20 08:19:17 2013
@@ -1,1 +1,1 @@
-/branches/1.8:1-396980
+/branches/1.8:1-397031

Modified: team/oej/teapot-1.8/configs/h323.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/oej/teapot-1.8/configs/h323.conf.sample?view=diff&rev=397032&r1=397031&r2=397032
==============================================================================
--- team/oej/teapot-1.8/configs/h323.conf.sample (original)
+++ team/oej/teapot-1.8/configs/h323.conf.sample Tue Aug 20 08:19:17 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: team/oej/teapot-1.8/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/oej/teapot-1.8/configs/sip.conf.sample?view=diff&rev=397032&r1=397031&r2=397032
==============================================================================
--- team/oej/teapot-1.8/configs/sip.conf.sample (original)
+++ team/oej/teapot-1.8/configs/sip.conf.sample Tue Aug 20 08:19:17 2013
@@ -313,6 +313,8 @@
 ;				; This should not be enabled on low-end devices.
 ;				; You should not enable this unless you have internal
 ;				; timing support enabled in asterisk.conf
+;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
@@ -1142,6 +1144,7 @@
 ; language
 ; allow
 ; disallow
+; autoframing
 ; insecure
 ; trustrpid
 ; progressinband