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

diff --git a/formats/format_g719.c b/formats/format_g719.c
index 6a981d1241386f5248e82c6d93dde38427382ca9..c5fc8efaace11cb3bd16d2a6f64a9c5c1c97da7a 100644 (file)
--- 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 3d48f26ec363658c9937d43a86fcfe5a270380ca..109811609c2409ec3a3d3f4e476a2848165216c1 100644 (file)
--- 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 53e344cdf175b420395f2074cea74bf5dce39842..3c5697f5d6bb53221afa82cbe9f8ce8f6f303154 100644 (file)
--- 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 439f8a69e174b86942356aa3315cd1dc8c8c958d..ad7d7fee7db3cea8cfa06a6d5597235ee3b52834 100644 (file)
--- 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 06d1d94d1720694bb6824254142fc88093c9069e..2b0b3413e81e6a822c06ae0f66c1bebbd1ed5caa 100644 (file)
--- 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 6e95c7ad4a91e477985005f8f70245bd312c6bb4..12c9d017075bb78321fff4b220db0d9c076f0a16 100644 (file)
--- 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 0a5ba94213a20dea54489670b2bac35d66d84bc7..f8fe75c427e1106c06f42de6674ed3e083bab11c 100644 (file)
--- 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 d2fa8a1c0193307afed1fa3ef4beb4bf1b7b321d..40bda2639382d24c683ff6ec3637bbb08f38e2a9 100644 (file)
--- 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 169ffbb32255fb37198bef1c4339a960a24afa23..9b1fb99652d96b6d72e0cc918359454467a12216 100644 (file)
--- 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 d45511a2e9b95896fc39f2a9327acb4e9e20c133..d2a08736084bfe4946014988e184fa175b1205c7 100644 (file)
--- 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 2b0db56e2759530b48ea50db5ac06585325ed616..76eb9c6af19dc6686156411dd4a3ae849196f58c 100644 (file)
--- 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 498317c82f891ba6463b8fb3b19787e1b3c185d5..0b8526bde63ff53643b62791c3eb8cfc9dda0b90 100644 (file)
--- 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 6017207cf8364989a80ed77dbc475d9dc665138f..5c7919307b4beab24f064832e28fbd8f7b57a6d7 100644 (file)
--- 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 538f77fe798a08e5def27c55ce9740b19ba75e21..578e64c7baabba9513969e343d62a4d9def0a89b 100644 (file)
--- 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 5e73fc9d8953263e782f837d3a66fab55f7aadc2..1e324941204218d01d0f348a029ec5a29a3a1782 100644 (file)
--- 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 1501375bb64e19b051d35b70b3c45466816022a4..c13dd7ac5042ec6f16843c34e54557fac98c9e64 100644 (file)
--- 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 050df73eba3df7a02d500e4d6d6aaa6942c8b249..37d81e58ab9b413fc97b99ec78cf95cdaa39ac9e 100644 (file)
--- 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 106d88cb74eb565a9de7fdcc08cb3bd5a5ef0adc..f864f281409c9c319c0ac5492c34976b8e7ae422 100644 (file)
--- 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
+);