[svn-commits] russell: branch 1.6.2 r184044 - in /branches/1.6.2: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Mar 24 17:02:01 2009
New Revision: 184044

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

........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/channel.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Tue Mar 24 17:02:01 2009
@@ -1,1 +1,1 @@
-/trunk:1-182359,182408,182450,182525,182530,182553,182722,182847,183028,183057,183108,183117,183242,183244,183321,183511,183560,183701,183766,183865,183914,184037
+/trunk:1-182359,182408,182450,182525,182530,182553,182722,182847,183028,183057,183108,183117,183242,183244,183321,183511,183560,183701,183766,183865,183914,184037,184043

Modified: branches/1.6.2/main/channel.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/main/channel.c?view=diff&rev=184044&r1=184043&r2=184044
==============================================================================
--- branches/1.6.2/main/channel.c (original)
+++ branches/1.6.2/main/channel.c Tue Mar 24 17:02:01 2009
@@ -718,6 +718,8 @@
 		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 */