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.2@233694 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 5 insertions, 1 deletions

diff --git a/formats/format_g729.c b/formats/format_g729.c
index cf7e20be7..44de933e5 100644
--- a/formats/format_g729.c
+++ b/formats/format_g729.c
@@ -145,4 +145,8 @@ static int unload_module(void)
 	return ast_format_unregister(g729_f.name);
 }	
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw G729 data");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw G729 data",
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = 10,
+);