Merged revisions 217286 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r217286 | seanbright | 2009-09-08 18:17:08 -0400 (Tue, 08 Sep 2009) | 4 lines
  
  Fix compilation of app_meetme.
  
  Reported by ebroad in #asterisk-bugs
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@217295 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2009-09-08 22:20:06 +00:00
parent 1cdd533d6a
commit be3c80c535

View File

@@ -2756,7 +2756,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
if ((conf->transframe[idx]->frametype != AST_FRAME_NULL) && if ((conf->transframe[idx]->frametype != AST_FRAME_NULL) &&
can_write(chan, confflags)) { can_write(chan, confflags)) {
struct ast_frame *cur; struct ast_frame *cur;
if (musiconhold && !ast_dsp_silence(dsp, conf->transframe[index], &confsilence) && confsilence < MEETME_DELAYDETECTTALK) { if (musiconhold && !ast_dsp_silence(dsp, conf->transframe[idx], &confsilence) && confsilence < MEETME_DELAYDETECTTALK) {
ast_moh_stop(chan); ast_moh_stop(chan);
mohtempstopped = 1; mohtempstopped = 1;
} }