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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@186466 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 5a20700c42ecd7355b306517e0409ca7c16a7495..18142b7a20c0d83e51cc2774f33b2cd1a4a97eb4 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -6305,7 +6305,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;