diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-03-01 16:14:41 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-03-01 16:14:41 +0000 |
commit | eb9ca80b08d05dd3ad3b541e0c1aa2ca5ff4498f (patch) | |
tree | feaee5e807013b3528b3f9779d12066758441e32 | |
parent | 2ec52857cdfa22d7a3cd5c13276898f9335dda75 (diff) |
Handle video codecs properly
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2281 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | channel.c | 2 | ||||
-rwxr-xr-x | channels/chan_sip.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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) || diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 518a6f315..3a0b3d885 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -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); |