Merged revisions 46778 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 1 Nov 2006 18:29:05 +0000 (18:29 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 1 Nov 2006 18:29:05 +0000 (18:29 +0000)
commit63ff3c85da33a8e340e7644343ea8c8f29b5c15d
treefd6b72b9db19dbe858a9244c074a7c9f23eb413f
parent9f78577f5e4aa3eaebb5ca476950d61143846847
Merged revisions 46778 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r46778 | russell | 2006-11-01 13:26:35 -0500 (Wed, 01 Nov 2006) | 17 lines

Merged revisions 46776 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r46776 | russell | 2006-11-01 13:24:17 -0500 (Wed, 01 Nov 2006) | 9 lines

soxmix and Asterisk expect different file extensions for certain formats.  This
was already handled for the wav49 format.  However, it was not handled for
ulaw and alaw.  I fixed this in such a way that using the alternate extensions
for ulaw and alaw will only happen if we know we're calling soxmix, and not a
custom script defined using the MONITOR_EXEC variable.  The wav49 processing
was left alone so that external scripts will see no behavior change.
(issue #7550, reported by mnicholson, proposed patch by junky, committed fix
is a bit different)

........

................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46779 65c4cc65-6c06-0410-ace0-fbb531ad65f3
res/res_monitor.c