Merged revisions 318331 via svnmerge from

Merged revisions 318331 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r318331 | twilson | 2011-05-09 15:04:41 -0500 (Mon, 09 May 2011) | 12 lines

  Don't offer video to directmedia callee unless caller offered it as well

  Make sure that when directmedia is enabled, that video is not offered to the
  callee even if it supports it. p->vrtp will not exist since the caller didn't
  offer video.

  (closes issue #19195)
  Reported by: one47
  Patches:
        sip_cant_add_video_rtp uploaded by one47 (license 23)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@318337 65c4cc65-6c06-0410-ace0-fbb531ad65f3