diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-21 02:11:39 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-21 02:11:39 +0000 |
| commit | 8b0c007ad990aa27d9868da49215fd1076ac77cc (patch) | |
| tree | 270b9c46c1e644483d6d2a35b509f43218ba3252 /codecs/codec_ilbc.c | |
| parent | a42edc84034f91932a3e12d503e07f76a6eb498a (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: http://svn.digium.com/svn/asterisk/trunk@40722 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs/codec_ilbc.c')
| -rw-r--r-- | codecs/codec_ilbc.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c index 98b5a1470..98d410e38 100644 --- a/codecs/codec_ilbc.c +++ b/codecs/codec_ilbc.c @@ -58,8 +58,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define ILBC_SAMPLES 240 /* 30ms at 8000 hz */ #define BUFFER_SAMPLES 8000 -static char *tdesc = "iLBC/PCM16 (signed linear) Codec Translator"; - struct ilbc_coder_pvt { iLBC_Enc_Inst_t enc; iLBC_Dec_Inst_t dec; @@ -215,33 +213,27 @@ static struct ast_translator lintoilbc = { .buf_size = (BUFFER_SAMPLES * ILBC_FRAME_LEN + ILBC_SAMPLES - 1) / ILBC_SAMPLES, }; -static int unload_module(void *mod) +static int unload_module(void) { int res; + res = ast_unregister_translator(&lintoilbc); res |= ast_unregister_translator(&ilbctolin); + return res; } -static int load_module(void *mod) +static int load_module(void) { int res; - res = ast_register_translator(&ilbctolin, mod); + + res = ast_register_translator(&ilbctolin); if (!res) - res=ast_register_translator(&lintoilbc, mod); + res=ast_register_translator(&lintoilbc); else ast_unregister_translator(&ilbctolin); - return res; -} -static const char *description(void) -{ - return tdesc; -} - -static const char *key(void) -{ - return ASTERISK_GPL_KEY; + return res; } -STD_MOD(MOD_1, NULL, NULL, NULL); +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "iLBC Coder/Decoder"); |