Handle video codecs properly

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2281 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-03-01 16:14:41 +00:00
parent 4160dfa6e1
commit a9d042db2c
2 changed files with 2 additions and 2 deletions

View File

@@ -2280,7 +2280,7 @@ int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags
*fo = f;
*rc = who;
res = 0;
ast_log(LOG_DEBUG, "Got a FRAME_CONTROL frame on channel %s\n",who->name);
ast_log(LOG_DEBUG, "Got a FRAME_CONTROL (%d) frame on channel %s\n", f->subclass, who->name);
break;
}
if ((f->frametype == AST_FRAME_VOICE) ||

View File

@@ -2692,7 +2692,7 @@ static int add_sdp(struct sip_request *resp, struct sip_pvt *p, struct ast_rtp *
cur = cur->next;
}
/* Now send any other common codecs, and non-codec formats: */
for (x = 1; x <= AST_FORMAT_MAX_AUDIO; x <<= 1) {
for (x = 1; x <= (videosupport ? AST_FORMAT_MAX_VIDEO : AST_FORMAT_MAX_AUDIO); x <<= 1) {
if ((p->jointcapability & x) && !(alreadysent & x)) {
if (sipdebug)
ast_verbose("Answering with capability %d\n", x);