Merged revisions 318337 via svnmerge from
authorTerry Wilson <twilson@digium.com>
Tue, 10 May 2011 00:22:02 +0000 (00:22 +0000)
committerTerry Wilson <twilson@digium.com>
Tue, 10 May 2011 00:22:02 +0000 (00:22 +0000)
commit07b3742ad259a92b4cefd9f149039d72c9034932
tree99f3b8c1b12a39af3cc4e529d8818a5605e2a3b5
parent08862040117c8585c00e5cefb79e55f21a9874ee
Merged revisions 318337 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r318337 | twilson | 2011-05-09 15:23:15 -0500 (Mon, 09 May 2011) | 18 lines

  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/trunk@318400 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_sip.c