diff options
Diffstat (limited to 'formats/format_ogg_vorbis.c')
-rw-r--r-- | formats/format_ogg_vorbis.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c index 84ef11b5d..d1122924a 100644 --- a/formats/format_ogg_vorbis.c +++ b/formats/format_ogg_vorbis.c @@ -21,6 +21,10 @@ * \ingroup formats */ +/* the order of these dependencies is important... it also specifies + the link order of the libraries during linking +*/ + /*** MODULEINFO <depend>vorbis</depend> <depend>ogg</depend> @@ -542,28 +546,17 @@ static const struct ast_format vorbis_f = { .close = ogg_vorbis_close, .buf_size = BUF_SIZE + AST_FRIENDLY_OFFSET, .desc_size = sizeof(struct vorbis_desc), - .module = &mod_data, /* XXX */ }; -static int load_module(void *mod) +static int load_module(void) { return ast_format_register(&vorbis_f); } -static int unload_module(void *mod) +static int unload_module(void) { return ast_format_unregister(vorbis_f.name); } -static const char *description(void) -{ - return "OGG/Vorbis audio"; -} - -static const char *key(void) -{ - return ASTERISK_GPL_KEY; -} - -STD_MOD1; +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "OGG/Vorbis audio"); |