From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 29 Jun 2007 20:56:50 +0000 (+0000)
Subject: Merged revisions 72705 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2196
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c26f1ce1bffff9357811d6ce2049a036a755e7f3;p=thirdparty%2Fasterisk.git

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

........
r72705 | russell | 2007-06-29 15:56:18 -0500 (Fri, 29 Jun 2007) | 1 line

give format_pcm a more concise destription
........


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

diff --git a/formats/format_pcm.c b/formats/format_pcm.c
index a3a40b7d49..6736ea9969 100644
--- a/formats/format_pcm.c
+++ b/formats/format_pcm.c
@@ -493,4 +493,4 @@ static int unload_module(void)
 		|| ast_format_unregister(g722_f.name);
 }	
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw/Sun uLaw/ALaw 8KHz Audio support (PCM,PCMA,AU) and G.722 16Khz Audio Support");
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw/Sun uLaw/ALaw 8KHz (PCM,PCMA,AU), G.722 16Khz");