IAX codec fixes (bug #3387)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4856 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 18 insertions, 0 deletions

diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
index 33eb02993..dd7f5e58c 100755
--- a/configs/iax.conf.sample
+++ b/configs/iax.conf.sample
@@ -173,6 +173,24 @@ tos=lowdelay
 ; of milliseconds.  See 'qualify' for individual peers to turn on for just
 ; a specific peer.
 ;
+;codecpriority=host
+;
+; codecpriority controls the codec negotiation of an inbound IAX call.
+; This option is inherited to all user entities.  It can also be defined 
+; in each user entity seperately which will override the setting in general.
+;
+; The valid values are:
+;
+; caller   - Consider the callers preferred order ahead of the host's.
+; host     - Consider the host's preferred order ahead of the caller's.
+; disabled - Disable the consideration of codec preference alltogether.
+;            (this is the original behaviour before preferences were added)
+; reqonly  - Same as disabled, only do not consider capabilities if
+;            the requested format is not available the call will only
+;            be accepted if the requested format is available.
+;
+; The default value is 'host'
+;
 autokill=yes
 ;
 ; Guest sections for unauthenticated connection attempts.  Just