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