Merge branch 'master' of git://git.freeswitch.org/freeswitch

This commit is contained in:
David Yat Sin
2010-09-17 11:09:34 -04:00
54 changed files with 5015 additions and 573 deletions

View File

@@ -267,7 +267,7 @@ TELETONE_API(int) teletone_mux_tones(teletone_generation_session_t *ts, teletone
ts->samples * 2);
}
}
return ts->samples;
return ts->samples / ts->channels;
}
TELETONE_API(int) teletone_run(teletone_generation_session_t *ts, const char *cmd)