Merged revisions 378854,378858-378859 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Thu, 10 Jan 2013 00:20:46 +0000 (00:20 +0000)
committerAutomerge script <automerge@asterisk.org>
Thu, 10 Jan 2013 00:20:46 +0000 (00:20 +0000)
commit41eba63840fb697b1b31426934fc78f4d96f9fcb
treec5a792e2b726be826a8525b4ae42cfcdb4eaa146
parente844969fbaa997e7050dba14a355c1267bed81af
Merged revisions 378854,378858-378859 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk

........
  r378854 | rmudgett | 2013-01-09 17:22:00 -0600 (Wed, 09 Jan 2013) | 1 line

  Fix logger.c function definition.
........
  r378858 | rmudgett | 2013-01-09 17:23:41 -0600 (Wed, 09 Jan 2013) | 6 lines

  Trivial misc bridge code changes.

  * softmix_bridge_thread() was redundantly initializing an 8K buffer.

  * Promoted a debug message to a warning in multiplexed_add_or_remove().
........
  r378859 | rmudgett | 2013-01-09 17:51:45 -0600 (Wed, 09 Jan 2013) | 6 lines

  * Simple optimization of bridge_playfile().

  * Squeezed some redundancy out of update_bridge_vars().

  * Wrapped long line in __ast_change_name_nolink().
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378868 65c4cc65-6c06-0410-ace0-fbb531ad65f3
bridges/bridge_multiplexed.c
bridges/bridge_softmix.c
main/channel.c
main/logger.c