diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-24 22:02:01 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-24 22:02:01 +0000 |
| commit | f335611bc83d3c896da346bedcf2371da889b854 (patch) | |
| tree | adffb09a9532bd50a623e44b295838be3abcdbeb /main | |
| parent | 539cb2436a6527299090073a185143cbf756f0c0 (diff) | |
Merged revisions 184043 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r184043 | russell | 2009-03-24 17:00:58 -0500 (Tue, 24 Mar 2009) | 2 lines
Put siren7 and siren14 in ast_best_codec() just so they're in there somewhere.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@184044 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/channel.c b/main/channel.c index 719e9f669..42ea4bfb3 100644 --- a/main/channel.c +++ b/main/channel.c @@ -718,6 +718,8 @@ int ast_best_codec(int fmts) AST_FORMAT_ULAW, /*! Unless of course, you're a silly European, so then prefer ALAW */ AST_FORMAT_ALAW, + AST_FORMAT_SIREN14, + AST_FORMAT_SIREN7, /*! G.722 is better then all below, but not as common as the above... so give ulaw and alaw priority */ AST_FORMAT_G722, /*! Okay, well, signed linear is easy to translate into other stuff */ |