diff options
Diffstat (limited to 'formats/format_pcm.c')
| -rw-r--r-- | formats/format_pcm.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/formats/format_pcm.c b/formats/format_pcm.c index 0b1706e50..fedc0632f 100644 --- a/formats/format_pcm.c +++ b/formats/format_pcm.c @@ -500,6 +500,14 @@ static struct ast_format_def au_f = { .buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET, /* this many shorts */ }; +static int unload_module(void) +{ + return ast_format_def_unregister(pcm_f.name) + || ast_format_def_unregister(alaw_f.name) + || ast_format_def_unregister(au_f.name) + || ast_format_def_unregister(g722_f.name); +} + static int load_module(void) { int i; @@ -517,19 +525,13 @@ static int load_module(void) if ( ast_format_def_register(&pcm_f) || ast_format_def_register(&alaw_f) || ast_format_def_register(&au_f) - || ast_format_def_register(&g722_f) ) - return AST_MODULE_LOAD_FAILURE; + || ast_format_def_register(&g722_f) ) { + unload_module(); + return AST_MODULE_LOAD_DECLINE; + } return AST_MODULE_LOAD_SUCCESS; } -static int unload_module(void) -{ - return ast_format_def_unregister(pcm_f.name) - || ast_format_def_unregister(alaw_f.name) - || ast_format_def_unregister(au_f.name) - || ast_format_def_unregister(g722_f.name); -} - AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw/Sun uLaw/ALaw 8KHz (PCM,PCMA,AU), G.722 16Khz", .support_level = AST_MODULE_SUPPORT_CORE, .load = load_module, |