Merged revisions 110880 via svnmerge from

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

................
r110880 | kpfleming | 2008-03-26 09:42:35 -0700 (Wed, 26 Mar 2008) | 10 lines

Merged revisions 110869 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r110869 | kpfleming | 2008-03-26 08:53:46 -0700 (Wed, 26 Mar 2008) | 2 lines

due to licensing restrictions, we cannot distribute the source code for iLBC encoding and decoding... so remove it, and add instructions on how the user can obtain it themselves

........

................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@110881 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 18 insertions, 0 deletions

diff --git a/UPGRADE.txt b/UPGRADE.txt
index 6fb214227..b74d7b3c6 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -187,3 +187,21 @@ Manager:
 * The Originate command now requires the Originate write permission.  For
    Originate with the Application parameter, you need the additional System
    privilege if you want to do anything that calls out to a subshell.
+
+iLBC Codec:
+
+* Previously, the Asterisk source code distribution included the iLBC
+  encoder/decoder source code, from Global IP Solutions
+  (http://www.gipscorp.com). This code is not licensed for
+  distribution, and thus has been removed from the Asterisk source
+  code distribution. If you wish to use codec_ilbc to support iLBC
+  channels in Asterisk, you must go to:
+
+  http://ilbcfreeware.org
+
+  and obtain the iLBC source code from that site, including agreeing
+  to the license agreement specified. The site has instructions on how
+  to extract the source code from the RFC file where it has been
+  published; after you have done that, copy the resulting *.c and *.h
+  files into the codecs/ilbc directory of the Asterisk source code
+  tree and follow your normal steps of building Asterisk.