diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-08-21 02:11:39 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-08-21 02:11:39 +0000 |
| commit | 0a27d8bfe5fa36d8cb600b5b520f9b5c7fbf0ed6 (patch) | |
| tree | 270b9c46c1e644483d6d2a35b509f43218ba3252 /formats/format_g726.c | |
| parent | f60ada0be22cd646454278e102d384a5dbaf7d59 (diff) | |
merge new_loader_completion branch, including (at least):
- restructured build tree and makefiles to eliminate recursion problems
- support for embedded modules
- support for static builds
- simpler cross-compilation support
- simpler module/loader interface (no exported symbols)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'formats/format_g726.c')
| -rw-r--r-- | formats/format_g726.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/formats/format_g726.c b/formats/format_g726.c index b0e123bbd..41cd87a08 100644 --- a/formats/format_g726.c +++ b/formats/format_g726.c @@ -204,7 +204,6 @@ static const struct ast_format f[] = { .read = g726_read, .buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET, .desc_size = sizeof(struct g726_desc), - .module = &mod_data, /* XXX */ }, { .name = "g726-32", @@ -219,7 +218,6 @@ static const struct ast_format f[] = { .read = g726_read, .buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET, .desc_size = sizeof(struct g726_desc), - .module = &mod_data, /* XXX */ }, { .name = "g726-24", @@ -234,7 +232,6 @@ static const struct ast_format f[] = { .read = g726_read, .buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET, .desc_size = sizeof(struct g726_desc), - .module = &mod_data, /* XXX */ }, { .name = "g726-16", @@ -249,15 +246,11 @@ static const struct ast_format f[] = { .read = g726_read, .buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET, .desc_size = sizeof(struct g726_desc), - .module = &mod_data, /* XXX */ }, { .format = 0 } /* terminator */ }; -/* - * Module interface (load_module, unload_module, usecount, description, key) - */ -static int load_module(void *mod) +static int load_module(void) { int i; @@ -270,7 +263,7 @@ static int load_module(void *mod) return 0; } -static int unload_module(void *mod) +static int unload_module(void) { int i; @@ -281,14 +274,4 @@ static int unload_module(void *mod) return(0); } -static const char *description(void) -{ - return "Raw G.726 (16/24/32/40kbps) data"; -} - -static const char *key(void) -{ - return ASTERISK_GPL_KEY; -} - -STD_MOD1; +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw G.726 (16/24/32/40kbps) data"); |