diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-25 00:32:23 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-25 00:32:23 +0000 |
| commit | cfed87ed3a4b4c177d860180d629a4a5924f58b0 (patch) | |
| tree | 94ac43ea2c20c5708d382f8ed7e32b81ce82ccfd /channels/chan_h323.c | |
| parent | 28cda01b7c4a10cca2ba565766595797fb0f7b72 (diff) | |
Merged revisions 46154 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r46154 | kpfleming | 2006-10-24 19:26:17 -0500 (Tue, 24 Oct 2006) | 2 lines
add passthrough and file format support for G.722 16KHz audio (issue #5084, original patch by andrew, updated by mithraen)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@46155 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_h323.c')
| -rw-r--r-- | channels/chan_h323.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c index 5cc7cddb0..ffb86b0d7 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -3122,6 +3122,8 @@ static char *convertcap(int cap) return "ULAW"; case AST_FORMAT_ALAW: return "ALAW"; + case AST_FORMAT_G722: + return "G.722"; case AST_FORMAT_ADPCM: return "G.728"; case AST_FORMAT_G729A: |