Merged revisions 184037 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r184037 | russell | 2009-03-24 16:40:44 -0500 (Tue, 24 Mar 2009) | 6 lines

Exclude slin16, siren7, and siren14 from bandwidth=low and =medium

The default codec configuration for chan_iax2 is bandwidth=low.  I noticed
slin16 being negotiated as the codec in some test calls, but that no longer
happens after this change.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@184039 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index a1fd1b9d0ee5f31840023defe0a6cd579130d97f..c2b3237ca72de468f13d7c25f0fe8caf95c44bc3 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -188,6 +188,7 @@ int (*iax2_regfunk)(const char *username, int onoff) = NULL;
 /* T1, maybe ISDN */
 #define IAX_CAPABILITY_MEDBANDWIDTH    (IAX_CAPABILITY_FULLBANDWIDTH &         \
                                         ~AST_FORMAT_SLINEAR &                  \
+                                        ~AST_FORMAT_SLINEAR16 &                        \
                                         ~AST_FORMAT_ULAW &                     \
                                         ~AST_FORMAT_ALAW &                     \
                                         ~AST_FORMAT_G722)