From: Joshua Colp <jcolp@digium.com>
Date: Thu, 13 Aug 2009 13:54:42 +0000 (+0000)
Subject: Merged revisions 212067 via svnmerge from
X-Git-Tag: 1.6.1.7-rc1~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bedce86b42eb02717c5bfc71f4954026312a765c;p=thirdparty%2Fasterisk.git

Merged revisions 212067 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r212067 | file | 2009-08-13 10:51:04 -0300 (Thu, 13 Aug 2009) | 2 lines

  Check an actual populated variable when seeing if we need to do video or not.
........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 3b0df05cad..ab183daaf6 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -8881,7 +8881,7 @@ static enum sip_result add_sdp(struct sip_request *resp, struct sip_pvt *p, int
 	}
 
 	/* Check if we need video in this call */
-	if (add_audio && (capability & AST_FORMAT_VIDEO_MASK) && !p->novideo) {
+	if (add_audio && (p->jointcapability & AST_FORMAT_VIDEO_MASK) && !p->novideo) {
 		if (p->vrtp) {
 			needvideo = TRUE;
 			ast_debug(2, "This call needs video offers!\n");