aboutsummaryrefslogtreecommitdiffstats
path: root/formats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-26 03:27:06 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-26 03:27:06 +0000
commit2d09b286a77ac7527118f09b9b510341589268d7 (patch)
treefd770f3d18b253f134b1391eb95e9a5114f7bc71 /formats
parent025821d9745d103398ec775afd3999c806177bb5 (diff)
Formats need to load before apps, because some apps call ast_format_str_reduce() at load time.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@279472 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'formats')
-rw-r--r--formats/format_g719.c6
-rw-r--r--formats/format_g723.c6
-rw-r--r--formats/format_g726.c6
-rw-r--r--formats/format_g729.c6
-rw-r--r--formats/format_gsm.c6
-rw-r--r--formats/format_h263.c6
-rw-r--r--formats/format_h264.c6
-rw-r--r--formats/format_ilbc.c6
-rw-r--r--formats/format_jpeg.c6
-rw-r--r--formats/format_ogg_vorbis.c6
-rw-r--r--formats/format_pcm.c6
-rw-r--r--formats/format_siren14.c6
-rw-r--r--formats/format_siren7.c6
-rw-r--r--formats/format_sln.c6
-rw-r--r--formats/format_sln16.c6
-rw-r--r--formats/format_vox.c6
-rw-r--r--formats/format_wav.c6
-rw-r--r--formats/format_wav_gsm.c6
18 files changed, 90 insertions, 18 deletions
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
+);