[asterisk-commits] tilghman: trunk r279473 - in /trunk: ./ formats/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Sun Jul 25 22:28:06 CDT 2010
Author: tilghman
Date: Sun Jul 25 22:28:02 2010
New Revision: 279473
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=279473
Log:
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.
........
Modified:
trunk/ (props changed)
trunk/formats/format_g719.c
trunk/formats/format_g723.c
trunk/formats/format_g726.c
trunk/formats/format_g729.c
trunk/formats/format_gsm.c
trunk/formats/format_h263.c
trunk/formats/format_h264.c
trunk/formats/format_ilbc.c
trunk/formats/format_jpeg.c
trunk/formats/format_ogg_vorbis.c
trunk/formats/format_pcm.c
trunk/formats/format_siren14.c
trunk/formats/format_siren7.c
trunk/formats/format_sln.c
trunk/formats/format_sln16.c
trunk/formats/format_vox.c
trunk/formats/format_wav.c
trunk/formats/format_wav_gsm.c
Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.8-merged (original)
+++ branch-1.8-merged Sun Jul 25 22:28:02 2010
@@ -1,1 +1,1 @@
-/branches/1.8:1-279056,279113,279227,279273,279280,279314,279390,279410,279442
+/branches/1.8:1-279056,279113,279227,279273,279280,279314,279390,279410,279442,279472
Modified: trunk/formats/format_g719.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_g719.c?view=diff&rev=279473&r1=279472&r2=279473
==============================================================================
--- trunk/formats/format_g719.c (original)
+++ trunk/formats/format_g719.c Sun Jul 25 22:28:02 2010
@@ -135,5 +135,9 @@
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
+);
Modified: trunk/formats/format_g723.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_g723.c?view=diff&rev=279473&r1=279472&r2=279473
==============================================================================
--- trunk/formats/format_g723.c (original)
+++ trunk/formats/format_g723.c Sun Jul 25 22:28:02 2010
@@ -149,4 +149,8 @@
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
+);
Modified: trunk/formats/format_g726.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_g726.c?view=diff&rev=279473&r1=279472&r2=279473
==============================================================================
--- trunk/formats/format_g726.c (original)
+++ trunk/formats/format_g726.c Sun Jul 25 22:28:02 2010
@@ -258,4 +258,8 @@
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
+);
Modified: trunk/formats/format_g729.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_g729.c?view=diff&rev=279473&r1=279472&r2=279473
==============================================================================
--- trunk/formats/format_g729.c (original)
+++ trunk/formats/format_g729.c Sun Jul 25 22:28:02 2010
@@ -145,4 +145,8 @@
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
+);
Modified: trunk/formats/format_gsm.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_gsm.c?view=diff&rev=279473&r1=279472&r2=279473
==============================================================================
--- trunk/formats/format_gsm.c (original)
+++ trunk/formats/format_gsm.c Sun Jul 25 22:28:02 2010
@@ -169,4 +169,8 @@
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
+);
Modified: trunk/formats/format_h263.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_h263.c?view=diff&rev=279473&r1=279472&r2=279473
==============================================================================
--- trunk/formats/format_h263.c (original)
+++ trunk/formats/format_h263.c Sun Jul 25 22:28:02 2010
@@ -183,4 +183,8 @@
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
+);
Modified: trunk/formats/format_h264.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_h264.c?view=diff&rev=279473&r1=279472&r2=279473
==============================================================================
--- trunk/formats/format_h264.c (original)
+++ trunk/formats/format_h264.c Sun Jul 25 22:28:02 2010
@@ -172,4 +172,8 @@
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
+);
Modified: trunk/formats/format_ilbc.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_ilbc.c?view=diff&rev=279473&r1=279472&r2=279473
==============================================================================
--- trunk/formats/format_ilbc.c (original)
+++ trunk/formats/format_ilbc.c Sun Jul 25 22:28:02 2010
@@ -143,4 +143,8 @@
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
+);
Modified: trunk/formats/format_jpeg.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_jpeg.c?view=diff&rev=279473&r1=279472&r2=279473
==============================================================================
--- trunk/formats/format_jpeg.c (original)
+++ trunk/formats/format_jpeg.c Sun Jul 25 22:28:02 2010
@@ -112,4 +112,8 @@
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
+);
Modified: trunk/formats/format_ogg_vorbis.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_ogg_vorbis.c?view=diff&rev=279473&r1=279472&r2=279473
==============================================================================
--- trunk/formats/format_ogg_vorbis.c (original)
+++ trunk/formats/format_ogg_vorbis.c Sun Jul 25 22:28:02 2010
@@ -556,4 +556,8 @@
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
+);
Modified: trunk/formats/format_pcm.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_pcm.c?view=diff&rev=279473&r1=279472&r2=279473
==============================================================================
--- trunk/formats/format_pcm.c (original)
+++ trunk/formats/format_pcm.c Sun Jul 25 22:28:02 2010
@@ -494,4 +494,8 @@
|| 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
+);
Modified: trunk/formats/format_siren14.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_siren14.c?view=diff&rev=279473&r1=279472&r2=279473
==============================================================================
--- trunk/formats/format_siren14.c (original)
+++ trunk/formats/format_siren14.c Sun Jul 25 22:28:02 2010
@@ -135,4 +135,8 @@
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
+);
Modified: trunk/formats/format_siren7.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_siren7.c?view=diff&rev=279473&r1=279472&r2=279473
==============================================================================
--- trunk/formats/format_siren7.c (original)
+++ trunk/formats/format_siren7.c Sun Jul 25 22:28:02 2010
@@ -135,4 +135,8 @@
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
+);
Modified: trunk/formats/format_sln.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_sln.c?view=diff&rev=279473&r1=279472&r2=279473
==============================================================================
--- trunk/formats/format_sln.c (original)
+++ trunk/formats/format_sln.c Sun Jul 25 22:28:02 2010
@@ -127,4 +127,8 @@
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
+);
Modified: trunk/formats/format_sln16.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_sln16.c?view=diff&rev=279473&r1=279472&r2=279473
==============================================================================
--- trunk/formats/format_sln16.c (original)
+++ trunk/formats/format_sln16.c Sun Jul 25 22:28:02 2010
@@ -135,4 +135,8 @@
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
+);
Modified: trunk/formats/format_vox.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_vox.c?view=diff&rev=279473&r1=279472&r2=279473
==============================================================================
--- trunk/formats/format_vox.c (original)
+++ trunk/formats/format_vox.c Sun Jul 25 22:28:02 2010
@@ -132,4 +132,8 @@
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
+);
Modified: trunk/formats/format_wav.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_wav.c?view=diff&rev=279473&r1=279472&r2=279473
==============================================================================
--- trunk/formats/format_wav.c (original)
+++ trunk/formats/format_wav.c Sun Jul 25 22:28:02 2010
@@ -495,4 +495,8 @@
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
+);
Modified: trunk/formats/format_wav_gsm.c
URL: http://svnview.digium.com/svn/asterisk/trunk/formats/format_wav_gsm.c?view=diff&rev=279473&r1=279472&r2=279473
==============================================================================
--- trunk/formats/format_wav_gsm.c (original)
+++ trunk/formats/format_wav_gsm.c Sun Jul 25 22:28:02 2010
@@ -548,4 +548,8 @@
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
+);
More information about the asterisk-commits
mailing list