From e9e4ca5cb7f9a4264ac7da0e6b8cde09adabab17 Mon Sep 17 00:00:00 2001 From: kpfleming Date: Fri, 3 Apr 2009 20:21:47 +0000 Subject: Merged revisions 186461 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r186461 | kpfleming | 2009-04-03 15:20:01 -0500 (Fri, 03 Apr 2009) | 11 lines 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: http://svn.digium.com/svn/asterisk/branches/1.6.2@186469 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_dahdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'channels/chan_dahdi.c') diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 97975867b..ebd2a59f5 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; -- cgit v1.2.3