Merged revisions 134980 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r134980 | tilghman | 2008-07-31 16:55:42 -0500 (Thu, 31 Jul 2008) | 16 lines

Blocked revisions 134976 via svnmerge

........
r134976 | tilghman | 2008-07-31 16:53:19 -0500 (Thu, 31 Jul 2008) | 9 lines

Specify codecs in callfiles and manager, to allow video calls to be set up
from callfiles and AMI.
(closes issue #9531)
 Reported by: Geisj
 Patches: 
       20080715__bug9531__1.4.diff.txt uploaded by Corydon76 (license 14)
       20080715__bug9531__1.6.0.diff.txt uploaded by Corydon76 (license 14)
 Tested by: Corydon76

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134981 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-07-31 21:58:26 +00:00
parent 2ea9a77dc1
commit 6d0cdb3f22
3 changed files with 23 additions and 7 deletions

View File

@@ -15,6 +15,9 @@
#
Channel: DAHDI/1
#
# You can specify codecs for the call
Codecs: alaw, speex, h264
#
# You may also specify a wait time (default is 45 seconds) for how long to
# wait for the channel to be answered, a retry time (default is 5 mins)
# for how soon to retry this call, and a maximum number of retries (default