[svn-commits] file: trunk r45453 - in /trunk: ./ main/rtp.c

[svn-commits at lists.digium.com]

Author: file
Date: Tue Oct 17 22:03:37 2006
New Revision: 45453

URL: http://svn.digium.com/view/asterisk?rev=45453&view=rev
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/main/rtp.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/rtp.c
URL: http://svn.digium.com/view/asterisk/trunk/main/rtp.c?rev=45453&r1=45452&r2=45453&view=diff
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Tue Oct 17 22:03:37 2006
@@ -1000,9 +1000,9 @@
 	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;
 }