diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2009-04-03 20:20:01 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2009-04-03 20:20:01 +0000 |
commit | 3525e37e633b8b7bcf59262fbab21c16afadfa35 (patch) | |
tree | 7654154e69d773fe24726a2413a6f8cf9ce523be | |
parent | a3c84f9575ac8c1b168bc4f02cf6e9ccd3b5d7f1 (diff) |
Merged revisions 186458 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r186458 | kpfleming | 2009-04-03 15:19:20 -0500 (Fri, 03 Apr 2009) | 5 lines
Fix a bug where DAHDI/Zaptel channels would not properly switch formats when requested
Don't offer AST_FORMAT_SLINEAR on DAHDI/Zaptel channels... while it could provide a slight performance benefit, the translation core in Asterisk has some flaws when a channel driver offers multiple raw formats. this fix is much simpler than fixing the translation core to solve that issue (although that will be done later).
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@186461 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | channels/chan_dahdi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index e4d03ad76..f520e32f7 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -7406,7 +7406,7 @@ static struct ast_channel *dahdi_new(struct dahdi_pvt *i, int state, int startpb deflaw = AST_FORMAT_ULAW; } ast_channel_set_fd(tmp, 0, i->subs[idx].dfd); - tmp->nativeformats = AST_FORMAT_SLINEAR | deflaw; + tmp->nativeformats = deflaw; /* Start out assuming ulaw since it's smaller :) */ tmp->rawreadformat = deflaw; tmp->readformat = deflaw; |