[asterisk-commits] file: trunk r54291 - in /trunk: ./ main/channel.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Tue Feb 13 19:12:21 2007
New Revision: 54291

URL: http://svn.digium.com/view/asterisk?view=rev&rev=54291
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?view=diff&rev=54291&r1=54290&r2=54291
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Tue Feb 13 19:12:21 2007
@@ -567,6 +567,8 @@
 		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 */