Merged revisions 54290 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r54290 | file | 2007-02-13 20:09:40 -0500 (Tue, 13 Feb 2007) | 2 lines

Add G722 to ast_best_codec. If anyone disagrees with it's placement, feel free to change it. (issue #9045 reported by gork)

........

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

diff --git a/main/channel.c b/main/channel.c
index b02178d39261b337582a1257d6b1ce57e3830e38..94e21d0823419647c0af51cd53781e56a29b4352 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -567,6 +567,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,
+               /*! 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 */
                AST_FORMAT_SLINEAR,
                /*! G.726 is standard ADPCM, in RFC3551 packing order */