[svn-commits] mmichelson: branch group/issue8824 r184042 - in /team/group/issue8824: ./ cha...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Mar 24 16:55:53 2009
New Revision: 184042

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=184042
Log:
Sync with trunk so I can post a new diff.


Modified:
    team/group/issue8824/   (props changed)
    team/group/issue8824/channels/chan_iax2.c

Propchange: team/group/issue8824/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar 24 16:55:53 2009
@@ -1,1 +1,1 @@
-/trunk:1-184024
+/trunk:1-184041

Modified: team/group/issue8824/channels/chan_iax2.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/issue8824/channels/chan_iax2.c?view=diff&rev=184042&r1=184041&r2=184042
==============================================================================
--- team/group/issue8824/channels/chan_iax2.c (original)
+++ team/group/issue8824/channels/chan_iax2.c Tue Mar 24 16:55:53 2009
@@ -270,6 +270,9 @@
 /* T1, maybe ISDN */
 #define IAX_CAPABILITY_MEDBANDWIDTH 	(IAX_CAPABILITY_FULLBANDWIDTH & 	\
 					 ~AST_FORMAT_SLINEAR &			\
+					 ~AST_FORMAT_SLINEAR16 &			\
+					 ~AST_FORMAT_SIREN7 &			\
+					 ~AST_FORMAT_SIREN14 &			\
 					 ~AST_FORMAT_ULAW &			\
 					 ~AST_FORMAT_ALAW &			\
 					 ~AST_FORMAT_G722)