diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-08 18:02:37 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-08 18:02:37 +0000 |
commit | 750a3b2766aa5b5a2c580222d38890c609fa0372 (patch) | |
tree | 00d0ab3bce609e1f0df3fa381f67cbcfb5639602 /formats/format_g726.c | |
parent | dd19e8e891e8eff6b89f54c7440f1c0ce2fb47a1 (diff) |
Merged revisions 233692 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r233692 | russell | 2009-12-08 12:00:16 -0600 (Tue, 08 Dec 2009) | 16 lines
Set a module load priority for format modules.
A recent change to app_voicemail made it such that the module now assumes that
all format modules are available while processing voicemail configuration.
However, when autoloading modules, it was possible that app_voicemail was
loaded before the format modules. Since format modules don't depend on
anything, set a module load priority on them to ensure that they get loaded
first when autoloading.
This fix applies to trunk, 1.6.1, and 1.6.2. The fix for 1.4 and 1.6.0 will
require a different approach since the module load priority functionality is
not present in the module API.
(issue #16412)
Reported by: jiddings
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@233693 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'formats/format_g726.c')
-rw-r--r-- | formats/format_g726.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/formats/format_g726.c b/formats/format_g726.c index d54b52d2c..2bf9f9587 100644 --- a/formats/format_g726.c +++ b/formats/format_g726.c @@ -258,4 +258,8 @@ static int unload_module(void) return(0); } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw G.726 (16/24/32/40kbps) data"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw G.726 (16/24/32/40kbps) data", + .load = load_module, + .unload = unload_module, + .load_pri = 10, +); |