Merged revisions 7599 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Thu, 22 Dec 2005 20:38:43 +0000 (20:38 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 22 Dec 2005 20:38:43 +0000 (20:38 +0000)
commitb60daeb58fef7712f900963b6648a3f37bc3e451
tree581bd46ccdf3b25cb91d70f8d5943ffa6d0f8d69
parent80322c1bdbc6fdc135e4fb88c5362191123ec7c7
Merged revisions 7599 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7599 | russell | 2005-12-22 15:36:47 -0500 (Thu, 22 Dec 2005) | 3 lines

revert changes to videosupport to allow per-peer setting, since it isn't quite
complete and there is not an obvious fix at this point

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7600 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_sip.c
configs/sip.conf.sample