Merged revisions 175801 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r175801 | oej | 2009-02-15 21:22:12 +0100 (Sön, 15 Feb 2009) | 10 lines

Merged revisions 175792 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r175792 | oej | 2009-02-15 21:20:21 +0100 (Sön, 15 Feb 2009) | 2 lines

Disable format_ilbc.so by default, like codec_ilbc.so

........

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


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@175816 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 5 insertions, 1 deletions

diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c
index aaddc6c38..af6b55cd6 100644
--- a/formats/format_ilbc.c
+++ b/formats/format_ilbc.c
@@ -24,7 +24,11 @@
  * \arg File name extension: ilbc
  * \ingroup formats
  */
- 
+
+/*** MODULEINFO
+        <defaultenabled>no</defaultenabled>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")