From 317429294c14df083d6e56c0ff3bf891d91a1d70 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Mon, 26 Jul 2010 03:28:02 +0000 Subject: Merged revisions 279472 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r279472 | tilghman | 2010-07-25 22:27:06 -0500 (Sun, 25 Jul 2010) | 2 lines Formats need to load before apps, because some apps call ast_format_str_reduce() at load time. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@279473 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- formats/format_g719.c | 6 +++++- formats/format_g723.c | 6 +++++- formats/format_g726.c | 6 +++++- formats/format_g729.c | 6 +++++- formats/format_gsm.c | 6 +++++- formats/format_h263.c | 6 +++++- formats/format_h264.c | 6 +++++- formats/format_ilbc.c | 6 +++++- formats/format_jpeg.c | 6 +++++- formats/format_ogg_vorbis.c | 6 +++++- formats/format_pcm.c | 6 +++++- formats/format_siren14.c | 6 +++++- formats/format_siren7.c | 6 +++++- formats/format_sln.c | 6 +++++- formats/format_sln16.c | 6 +++++- formats/format_vox.c | 6 +++++- formats/format_wav.c | 6 +++++- formats/format_wav_gsm.c | 6 +++++- 18 files changed, 90 insertions(+), 18 deletions(-) (limited to 'formats') diff --git a/formats/format_g719.c b/formats/format_g719.c index 6a981d124..c5fc8efaa 100644 --- a/formats/format_g719.c +++ b/formats/format_g719.c @@ -135,5 +135,9 @@ static int unload_module(void) return ast_format_unregister(g719_f.name); } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "ITU G.719"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ITU G.719", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_APP_DEPEND +); diff --git a/formats/format_g723.c b/formats/format_g723.c index 3d48f26ec..109811609 100644 --- a/formats/format_g723.c +++ b/formats/format_g723.c @@ -149,4 +149,8 @@ static int unload_module(void) return ast_format_unregister(g723_1_f.name); } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "G.723.1 Simple Timestamp File Format"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "G.723.1 Simple Timestamp File Format", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_APP_DEPEND +); diff --git a/formats/format_g726.c b/formats/format_g726.c index 53e344cdf..3c5697f5d 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 = AST_MODPRI_APP_DEPEND +); diff --git a/formats/format_g729.c b/formats/format_g729.c index 439f8a69e..ad7d7fee7 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 G.729 data", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_APP_DEPEND +); diff --git a/formats/format_gsm.c b/formats/format_gsm.c index 06d1d94d1..2b0b3413e 100644 --- a/formats/format_gsm.c +++ b/formats/format_gsm.c @@ -169,4 +169,8 @@ static int unload_module(void) return ast_format_unregister(gsm_f.name); } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw GSM data"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw GSM data", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_APP_DEPEND +); diff --git a/formats/format_h263.c b/formats/format_h263.c index 6e95c7ad4..12c9d0170 100644 --- a/formats/format_h263.c +++ b/formats/format_h263.c @@ -183,4 +183,8 @@ static int unload_module(void) return ast_format_unregister(h263_f.name); } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw H.263 data"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw H.263 data", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_APP_DEPEND +); diff --git a/formats/format_h264.c b/formats/format_h264.c index 0a5ba9421..f8fe75c42 100644 --- a/formats/format_h264.c +++ b/formats/format_h264.c @@ -172,4 +172,8 @@ static int unload_module(void) return ast_format_unregister(h264_f.name); } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw H.264 data"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw H.264 data", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_APP_DEPEND +); diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c index d2fa8a1c0..40bda2639 100644 --- a/formats/format_ilbc.c +++ b/formats/format_ilbc.c @@ -143,4 +143,8 @@ static int unload_module(void) return ast_format_unregister(ilbc_f.name); } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw iLBC data"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw iLBC data", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_APP_DEPEND +); diff --git a/formats/format_jpeg.c b/formats/format_jpeg.c index 169ffbb32..9b1fb9965 100644 --- a/formats/format_jpeg.c +++ b/formats/format_jpeg.c @@ -112,4 +112,8 @@ static int unload_module(void) return 0; } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "jpeg (joint picture experts group) image format"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "jpeg (joint picture experts group) image format", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_APP_DEPEND +); diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c index d45511a2e..d2a087360 100644 --- a/formats/format_ogg_vorbis.c +++ b/formats/format_ogg_vorbis.c @@ -556,4 +556,8 @@ static int unload_module(void) return ast_format_unregister(vorbis_f.name); } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "OGG/Vorbis audio"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "OGG/Vorbis audio", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_APP_DEPEND +); diff --git a/formats/format_pcm.c b/formats/format_pcm.c index 2b0db56e2..76eb9c6af 100644 --- a/formats/format_pcm.c +++ b/formats/format_pcm.c @@ -494,4 +494,8 @@ static int unload_module(void) || ast_format_unregister(g722_f.name); } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw/Sun uLaw/ALaw 8KHz (PCM,PCMA,AU), G.722 16Khz"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw/Sun uLaw/ALaw 8KHz (PCM,PCMA,AU), G.722 16Khz", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_APP_DEPEND +); diff --git a/formats/format_siren14.c b/formats/format_siren14.c index 498317c82..0b8526bde 100644 --- a/formats/format_siren14.c +++ b/formats/format_siren14.c @@ -135,4 +135,8 @@ static int unload_module(void) return ast_format_unregister(siren14_f.name); } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "ITU G.722.1 Annex C (Siren14, licensed from Polycom)"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ITU G.722.1 Annex C (Siren14, licensed from Polycom)", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_APP_DEPEND +); diff --git a/formats/format_siren7.c b/formats/format_siren7.c index 6017207cf..5c7919307 100644 --- a/formats/format_siren7.c +++ b/formats/format_siren7.c @@ -135,4 +135,8 @@ static int unload_module(void) return ast_format_unregister(siren7_f.name); } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "ITU G.722.1 (Siren7, licensed from Polycom)"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ITU G.722.1 (Siren7, licensed from Polycom)", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_APP_DEPEND +); diff --git a/formats/format_sln.c b/formats/format_sln.c index 538f77fe7..578e64c7b 100644 --- a/formats/format_sln.c +++ b/formats/format_sln.c @@ -127,4 +127,8 @@ static int unload_module(void) return ast_format_unregister(slin_f.name); } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw Signed Linear Audio support (SLN)"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw Signed Linear Audio support (SLN)", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_APP_DEPEND +); diff --git a/formats/format_sln16.c b/formats/format_sln16.c index 5e73fc9d8..1e3249412 100644 --- a/formats/format_sln16.c +++ b/formats/format_sln16.c @@ -135,4 +135,8 @@ static int unload_module(void) return ast_format_unregister(slin_f.name); } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw Signed Linear 16KHz Audio support (SLN16)"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw Signed Linear 16KHz Audio support (SLN16)", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_APP_DEPEND +); diff --git a/formats/format_vox.c b/formats/format_vox.c index 1501375bb..c13dd7ac5 100644 --- a/formats/format_vox.c +++ b/formats/format_vox.c @@ -132,4 +132,8 @@ static int unload_module(void) return ast_format_unregister(vox_f.name); } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Dialogic VOX (ADPCM) File Format"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Dialogic VOX (ADPCM) File Format", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_APP_DEPEND +); diff --git a/formats/format_wav.c b/formats/format_wav.c index 050df73eb..37d81e58a 100644 --- a/formats/format_wav.c +++ b/formats/format_wav.c @@ -495,4 +495,8 @@ static int unload_module(void) return ast_format_unregister(wav_f.name); } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Microsoft WAV format (8000Hz Signed Linear)"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Microsoft WAV format (8000Hz Signed Linear)", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_APP_DEPEND +); diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c index 106d88cb7..f864f2814 100644 --- a/formats/format_wav_gsm.c +++ b/formats/format_wav_gsm.c @@ -548,4 +548,8 @@ static int unload_module(void) return ast_format_unregister(wav49_f.name); } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Microsoft WAV format (Proprietary GSM)"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Microsoft WAV format (Proprietary GSM)", + .load = load_module, + .unload = unload_module, + .load_pri = AST_MODPRI_APP_DEPEND +); -- cgit v1.2.3