Author: file Date: Mon Jul 23 13:31:06 2007 New Revision: 76655 URL: http://svn.digium.com/view/asterisk?view=rev&rev=76655 Log: Merged revisions 76654 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4
................ r76654 | file | 2007-07-23 15:29:48 -0300 (Mon, 23 Jul 2007) | 12 lines Merged revisions 76653 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r76653 | file | 2007-07-23 15:28:13 -0300 (Mon, 23 Jul 2007) | 4 lines (closes issue #5866) Reported by: tyler Do not force channel format changes when a generator is present. The generator may have changed the formats itself and changing them back would cause issues. ........ ................ Modified: trunk/ (props changed) trunk/channels/chan_agent.c Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-1.4-merged' - no diff available. Modified: trunk/channels/chan_agent.c URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_agent.c?view=diff&rev=76655&r1=76654&r2=76655 ============================================================================== --- trunk/channels/chan_agent.c (original) +++ trunk/channels/chan_agent.c Mon Jul 23 13:31:06 2007 @@ -191,9 +191,9 @@ ast_set_read_format(ast, ast->readformat); \ ast_set_write_format(ast, ast->writeformat); \ } \ - if (p->chan->readformat != ast->rawreadformat) \ + if (p->chan->readformat != ast->rawreadformat && !p->chan->generator) \ ast_set_read_format(p->chan, ast->rawreadformat); \ - if (p->chan->writeformat != ast->rawwriteformat) \ + if (p->chan->writeformat != ast->rawwriteformat && !p->chan->generator) \ ast_set_write_format(p->chan, ast->rawwriteformat); \ } \ } while(0) _______________________________________________ --Bandwidth and Colocation Provided by http://www.api-digital.com-- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
