1 files changed, 7 insertions, 12 deletions
diff --git a/formats/format_g729.c b/formats/format_g729.c
index 1719e3a5c..387641e7a 100644
--- a/formats/format_g729.c
+++ b/formats/format_g729.c
@@ -134,8 +134,6 @@ static off_t g729_tell(struct ast_filestream *fs)
 	return (offset/BUF_SIZE)*G729A_SAMPLES;
 }
 
-static struct ast_format_lock me = { .usecnt = -1 };
-
 static const struct ast_format g729_f = {
 	.name = "g729",
 	.exts = "g729",
@@ -146,30 +144,27 @@ static const struct ast_format g729_f = {
 	.tell = g729_tell,
 	.read = g729_read,
 	.buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET,
-	.lockp = &me,
+	.module = &mod_data, /* XXX */
 };
 
-int load_module()
+static int load_module(void *mod)
 {
 	return ast_format_register(&g729_f);
 }
 
-int unload_module()
+static int unload_module(void *mod)
 {
 	return ast_format_unregister(g729_f.name);
 }	
 
-int usecount()
-{
-	return me.usecnt;
-}
-
-const char *description()
+static const char *description(void)
 {
 	return "Raw G729 data";
 }
 
-const char *key()
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD1;