[asterisk-commits] qwell: trunk r94541 - /trunk/codecs/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Dec 21 14:12:50 CST 2007
Author: qwell
Date: Fri Dec 21 14:12:50 2007
New Revision: 94541
URL: http://svn.digium.com/view/asterisk?view=rev&rev=94541
Log:
codecs.conf really shouldn't be mandatory.. it never had been before, so let's go back to being optional.
A big "thank you" to pnlarsson on IRC for allowing me access to his system to debug this.
Closes issue #11584.
Modified:
trunk/codecs/codec_adpcm.c
trunk/codecs/codec_alaw.c
trunk/codecs/codec_g722.c
trunk/codecs/codec_g726.c
trunk/codecs/codec_gsm.c
trunk/codecs/codec_lpc10.c
trunk/codecs/codec_speex.c
trunk/codecs/codec_ulaw.c
trunk/codecs/codec_zap.c
Modified: trunk/codecs/codec_adpcm.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_adpcm.c?view=diff&rev=94541&r1=94540&r2=94541
==============================================================================
--- trunk/codecs/codec_adpcm.c (original)
+++ trunk/codecs/codec_adpcm.c Fri Dec 21 14:12:50 2007
@@ -346,7 +346,7 @@
struct ast_config *cfg = ast_config_load("codecs.conf", config_flags);
struct ast_variable *var;
if (cfg == NULL)
- return -1;
+ return 0;
if (cfg == CONFIG_STATUS_FILEUNCHANGED)
return 0;
for (var = ast_variable_browse(cfg, "plc"); var ; var = var->next) {
Modified: trunk/codecs/codec_alaw.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_alaw.c?view=diff&rev=94541&r1=94540&r2=94541
==============================================================================
--- trunk/codecs/codec_alaw.c (original)
+++ trunk/codecs/codec_alaw.c Fri Dec 21 14:12:50 2007
@@ -129,7 +129,7 @@
struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
struct ast_config *cfg = ast_config_load("codecs.conf", config_flags);
if (cfg == NULL)
- return -1;
+ return 0;
if (cfg == CONFIG_STATUS_FILEUNCHANGED)
return 0;
for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) {
Modified: trunk/codecs/codec_g722.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_g722.c?view=diff&rev=94541&r1=94540&r2=94541
==============================================================================
--- trunk/codecs/codec_g722.c (original)
+++ trunk/codecs/codec_g722.c Fri Dec 21 14:12:50 2007
@@ -231,7 +231,7 @@
struct ast_config *cfg = ast_config_load("codecs.conf", config_flags);
if (cfg == NULL)
- return -1;
+ return 0;
if (cfg == CONFIG_STATUS_FILEUNCHANGED)
return 0;
for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) {
Modified: trunk/codecs/codec_g726.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_g726.c?view=diff&rev=94541&r1=94540&r2=94541
==============================================================================
--- trunk/codecs/codec_g726.c (original)
+++ trunk/codecs/codec_g726.c Fri Dec 21 14:12:50 2007
@@ -891,7 +891,7 @@
struct ast_config *cfg = ast_config_load("codecs.conf", config_flags);
if (cfg == NULL)
- return -1;
+ return 0;
if (cfg == CONFIG_STATUS_FILEUNCHANGED)
return 0;
for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) {
Modified: trunk/codecs/codec_gsm.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_gsm.c?view=diff&rev=94541&r1=94540&r2=94541
==============================================================================
--- trunk/codecs/codec_gsm.c (original)
+++ trunk/codecs/codec_gsm.c Fri Dec 21 14:12:50 2007
@@ -229,8 +229,8 @@
struct ast_variable *var;
struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
struct ast_config *cfg = ast_config_load("codecs.conf", config_flags);
- if (!cfg)
- return -1;
+ if (cfg == NULL)
+ return 0;
if (cfg == CONFIG_STATUS_FILEUNCHANGED)
return 0;
for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) {
Modified: trunk/codecs/codec_lpc10.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_lpc10.c?view=diff&rev=94541&r1=94540&r2=94541
==============================================================================
--- trunk/codecs/codec_lpc10.c (original)
+++ trunk/codecs/codec_lpc10.c Fri Dec 21 14:12:50 2007
@@ -256,7 +256,7 @@
struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
struct ast_config *cfg = ast_config_load("codecs.conf", config_flags);
if (cfg == NULL)
- return -1;
+ return 0;
if (cfg == CONFIG_STATUS_FILEUNCHANGED)
return 0;
for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) {
Modified: trunk/codecs/codec_speex.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_speex.c?view=diff&rev=94541&r1=94540&r2=94541
==============================================================================
--- trunk/codecs/codec_speex.c (original)
+++ trunk/codecs/codec_speex.c Fri Dec 21 14:12:50 2007
@@ -373,8 +373,8 @@
int res;
float res_f;
- if (cfg == NULL || cfg == CONFIG_STATUS_FILEUNCHANGED)
- return -1;
+ if (cfg == NULL)
+ return 0;
if (cfg == CONFIG_STATUS_FILEUNCHANGED)
return 0;
Modified: trunk/codecs/codec_ulaw.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_ulaw.c?view=diff&rev=94541&r1=94540&r2=94541
==============================================================================
--- trunk/codecs/codec_ulaw.c (original)
+++ trunk/codecs/codec_ulaw.c Fri Dec 21 14:12:50 2007
@@ -142,7 +142,7 @@
struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
struct ast_config *cfg = ast_config_load("codecs.conf", config_flags);
if (cfg == NULL)
- return -1;
+ return 0;
if (cfg == CONFIG_STATUS_FILEUNCHANGED)
return 0;
for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) {
Modified: trunk/codecs/codec_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_zap.c?view=diff&rev=94541&r1=94540&r2=94541
==============================================================================
--- trunk/codecs/codec_zap.c (original)
+++ trunk/codecs/codec_zap.c Fri Dec 21 14:12:50 2007
@@ -377,8 +377,8 @@
struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
struct ast_config *cfg = ast_config_load("codecs.conf", config_flags);
- if (!cfg)
- return -1;
+ if (cfg == NULL)
+ return 0;
if (cfg == CONFIG_STATUS_FILEUNCHANGED)
return 0;
More information about the asterisk-commits
mailing list