diff options
| author | Joshua Colp <jcolp@digium.com> | 2006-10-18 03:03:37 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2006-10-18 03:03:37 +0000 |
| commit | bb8926d50c9862f196addfca8bc34af9ab4c60a1 (patch) | |
| tree | 8699d0cf1f7ee575a79b7cae5357ce9d62f8d33c /main/rtp.c | |
| parent | 40b8afd54ff39e85072d964681951fef17b7fe21 (diff) | |
Merged revisions 45452 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r45452 | file | 2006-10-17 23:02:08 -0400 (Tue, 17 Oct 2006) | 2 lines
Don't segfault if you're using a channel driver that doesn't turn RTCP on
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45453 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/rtp.c')
| -rw-r--r-- | main/rtp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/rtp.c b/main/rtp.c index 9c17b32bf..589584dee 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -1000,9 +1000,9 @@ static void calc_rxstamp(struct timeval *tv, struct ast_rtp *rtp, unsigned int t if (d<0) d=-d; rtp->rxjitter += (1./16.) * (d - rtp->rxjitter); - if (rtp->rxjitter > rtp->rtcp->maxrxjitter) + if (rtp->rtcp && rtp->rxjitter > rtp->rtcp->maxrxjitter) rtp->rtcp->maxrxjitter = rtp->rxjitter; - if (rtp->rxjitter < rtp->rtcp->minrxjitter) + if (rtp->rtcp && rtp->rxjitter < rtp->rtcp->minrxjitter) rtp->rtcp->minrxjitter = rtp->rxjitter; } |