summaryrefslogtreecommitdiff
path: root/include/asterisk
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2006-10-25 00:32:23 +0000
committerKevin P. Fleming <kpfleming@digium.com>2006-10-25 00:32:23 +0000
commit88efcea05e9e81aadf916d549dbcceeadf0387f3 (patch)
tree94ac43ea2c20c5708d382f8ed7e32b81ce82ccfd /include/asterisk
parent9178e4223eae460fc85dbc9fe515d3cf1490f9f3 (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: https://origsvn.digium.com/svn/asterisk/trunk@46155 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk')
-rw-r--r--include/asterisk/frame.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h
index bcc533a95..fa1c12891 100644
--- a/include/asterisk/frame.h
+++ b/include/asterisk/frame.h
@@ -240,6 +240,8 @@ extern struct ast_frame ast_null_frame;
#define AST_FORMAT_ILBC (1 << 10)
/*! ADPCM (G.726, 32kbps, RFC3551 codeword packing) */
#define AST_FORMAT_G726 (1 << 11)
+/*! G.722 */
+#define AST_FORMAT_G722 (1 << 12)
/*! Maximum audio format */
#define AST_FORMAT_MAX_AUDIO (1 << 15)
/*! Maximum audio mask */