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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@184044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
16 years ago · abfd12121a
parent 614ea515c1
commit abfd12121a
1 changed files with 2 additions and 0 deletions
--- 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 */