[asterisk-commits] file: branch group/media_formats-reviewed-trunk r418754 - in /team/group/medi...

[SVN commits to the Asterisk project]

Author: file
Date: Wed Jul 16 07:02:26 2014
New Revision: 418754

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418754
Log:
codec_adpcm: Change description of codec "ADPCM" to "Dialogic ADPCM"

Technically, ADPCM is a method that can be applied to several codecs.
Asterisk's ADPCM codec is the Dialogic ADPCM or VOX codec.

See http://en.wikipedia.org/wiki/Dialogic_ADPCM for more information
about said codec.

Review: https://reviewboard.asterisk.org/r/3744

patches:
  rb3744.patch uploaded by dennis.guse (License 6513)
........

Merged revisions 418738 from http://svn.asterisk.org/svn/asterisk/trunk

Modified:
    team/group/media_formats-reviewed-trunk/   (props changed)
    team/group/media_formats-reviewed-trunk/codecs/codec_adpcm.c
    team/group/media_formats-reviewed-trunk/main/codec_builtin.c

Propchange: team/group/media_formats-reviewed-trunk/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/media_formats-reviewed-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul 16 07:02:26 2014
@@ -1,1 +1,1 @@
-/trunk:1-418719
+/trunk:1-418753

Modified: team/group/media_formats-reviewed-trunk/codecs/codec_adpcm.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats-reviewed-trunk/codecs/codec_adpcm.c?view=diff&rev=418754&r1=418753&r2=418754
==============================================================================
--- team/group/media_formats-reviewed-trunk/codecs/codec_adpcm.c (original)
+++ team/group/media_formats-reviewed-trunk/codecs/codec_adpcm.c Wed Jul 16 07:02:26 2014
@@ -154,7 +154,7 @@
 /*
  * Adpcm
  *  Takes a signed linear signal and encodes it as ADPCM
- *  For more information see http://support.dialogic.com/appnotes/adpcm.pdf
+ *  For more information see http://en.wikipedia.org/wiki/Dialogic_ADPCM
  *
  * Results:
  *  Foo.

Modified: team/group/media_formats-reviewed-trunk/main/codec_builtin.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats-reviewed-trunk/main/codec_builtin.c?view=diff&rev=418754&r1=418753&r2=418754
==============================================================================
--- team/group/media_formats-reviewed-trunk/main/codec_builtin.c (original)
+++ team/group/media_formats-reviewed-trunk/main/codec_builtin.c Wed Jul 16 07:02:26 2014
@@ -228,7 +228,7 @@
 
 static struct ast_codec adpcm = {
 	.name = "adpcm",
-	.description = "ADPCM",
+	.description = "Dialogic ADPCM",
 	.type = AST_MEDIA_TYPE_AUDIO,
 	.sample_rate = 8000,
 	.minimum_ms = 10,