diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-03-07 17:55:11 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-03-07 17:55:11 +0000 |
| commit | e7da006562e77df839c6b5f26c7b69ec99539df4 (patch) | |
| tree | 2522947bd1bac6adbda0e54134f73c44b30421a7 /channels | |
| parent | 061df742597e9c92db9cf31675bdcbada59d33ec (diff) | |
Merged revisions 58240 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58240 | file | 2007-03-07 12:52:58 -0500 (Wed, 07 Mar 2007) | 2 lines
Ensure we have (or should have) at least one matching codec before attempting early bridge SDP seeding. (issue #9221 reported by marcelbarbulescu)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58241 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 3b040363f..98a43b979 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -17830,7 +17830,7 @@ static int sip_sipredirect(struct sip_pvt *p, const char *dest) static int sip_get_codec(struct ast_channel *chan) { struct sip_pvt *p = chan->tech_pvt; - return p->peercapability; + return p->peercapability ? p->peercapability : p->capability; } /*! \brief Send a poke to all known peers |