summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2012-01-28 14:52:05 +0000
committerKevin P. Fleming <kpfleming@digium.com>2012-01-28 14:52:05 +0000
commit702335009897b85d2c30c175cab27108908840e5 (patch)
tree50c7566da1fa9ede417f0f43eda279511ca33958 /main
parent3b785264b038583e4d7d2f0226cfe6204c5e1562 (diff)
Add 'L16-256' MIME subtype alias for slin16.
Asterisk has supported the 'L16' MIME subtype for 16kHz signed linear (PCM) audio for quite some time, but some endpoints refer to it as 'L16-256'. This commit adds this as an alias for the existing format. ........ Merged revisions 353126 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 353127 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@353128 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/rtp_engine.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/rtp_engine.c b/main/rtp_engine.c
index 0637f5338..3e2e39ba8 100644
--- a/main/rtp_engine.c
+++ b/main/rtp_engine.c
@@ -1998,6 +1998,7 @@ int ast_rtp_engine_init()
set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_ADPCM, 0), 0, "audio", "DVI4", 8000);
set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_SLINEAR, 0), 0, "audio", "L16", 8000);
set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_SLINEAR16, 0), 0, "audio", "L16", 16000);
+ set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_SLINEAR16, 0), 0, "audio", "L16-256", 16000);
set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_LPC10, 0), 0, "audio", "LPC", 8000);
set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_G729A, 0), 0, "audio", "G729", 8000);
set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_G729A, 0), 0, "audio", "G729A", 8000);