aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b>2006-01-30 21:16:43 +0000
committermogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b>2006-01-30 21:16:43 +0000
commitf4cc87694f297cbec28a8598893bb826f8cda0cd (patch)
treeee5178262395c3a6f074d7c726a791dabe63f3a5
parent6a9f078aee78d975a19244eb92b7ed19e11434d6 (diff)
reverting blocks 9 and 10 from revision 7547
fixes bug 6080 git-svn-id: http://svn.digium.com/svn/asterisk/trunk@8938 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_meetme.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 73c52acf1..205b5ac4a 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -426,8 +426,6 @@ static void conf_play(struct ast_channel *chan, struct ast_conference *conf, int
unsigned char *data;
int len;
int res = -1;
- short *data2;
- int x;
if (!chan->_softhangup)
res = ast_autoservice_start(chan);
@@ -448,10 +446,7 @@ static void conf_play(struct ast_channel *chan, struct ast_conference *conf, int
len = 0;
}
if (data) {
- data2 = alloca(len * 2);
- for (x=0;x<len;x++)
- data2[x] = AST_MULAW(data[x]);
- careful_write(conf->fd, (unsigned char *)data2, len << 1, 1);
+ careful_write(conf->fd, data, len, 1);
}
AST_LIST_UNLOCK(&confs);