aboutsummaryrefslogtreecommitdiffstats
path: root/formats/format_h264.c
diff options
context:
space:
mode:
authorrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2006-04-14 14:08:19 +0000
committerrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2006-04-14 14:08:19 +0000
commit3664249356aa4768fcb0b3b8e6cf9365fcbd0c8d (patch)
treeb68f48482e463e9c31126b2e3e24fca1dd2f6c82 /formats/format_h264.c
parentf9d382fc079246930a99640d7835d6ae3e4149db (diff)
This rather large commit changes the way modules are loaded.
As partly documented in loader.c and include/asterisk/module.h, modules are now expected to return all of their methods and flags into a structure 'mod_data', and are normally loaded with RTLD_NOW | RTLD_LOCAL, so symbols are resolved immediately and conflicts should be less likely. Only in a small number of cases (res_*, typically) modules are loaded RTLD_GLOBAL, so they can export symbols. The core of the change is only the two files loader.c and include/asterisk/module.h, all the rest is simply adaptation of the existing modules to the new API, a rather mechanical (but believe me, time and finger-consuming!) process whose detail you can figure out by svn diff'ing any single module. Expect some minor compilation issue after this change, please report it on mantis http://bugs.digium.com/view.php?id=6968 so we collect all the feedback in one place. I am just sorry that this change missed SVN version number 20000! git-svn-id: http://svn.digium.com/svn/asterisk/trunk@20003 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'formats/format_h264.c')
-rw-r--r--formats/format_h264.c19
1 files changed, 7 insertions, 12 deletions
diff --git a/formats/format_h264.c b/formats/format_h264.c
index 26db782e5..5c4ddf8f0 100644
--- a/formats/format_h264.c
+++ b/formats/format_h264.c
@@ -156,8 +156,6 @@ static off_t h264_tell(struct ast_filestream *fs)
return offset; /* XXX totally bogus, needs fixing */
}
-static struct ast_format_lock me = { .usecnt = -1 };
-
static const struct ast_format h264_f = {
.name = "h264",
.exts = "h264",
@@ -170,30 +168,27 @@ static const struct ast_format h264_f = {
.read = h264_read,
.buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET,
.desc_size = sizeof(struct h264_desc),
- .lockp = &me,
+ .module = &mod_data, /* XXX */
};
-int load_module()
+static int load_module(void *mod)
{
return ast_format_register(&h264_f);
}
-int unload_module()
+static int unload_module(void *mod)
{
return ast_format_unregister(h264_f.name);
}
-int usecount()
-{
- return me.usecnt;
-}
-
-const char *description()
+static const char *description(void)
{
return "Raw h264 data";
}
-const char *key()
+static const char *key(void)
{
return ASTERISK_GPL_KEY;
}
+
+STD_MOD1;