[svn-commits] tilghman: branch 1.6.0 r106608 - in /branches/1.6.0: ./ main/rtp.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Mar  7 09:24:00 2008
New Revision: 106608

URL: http://svn.digium.com/view/asterisk?view=rev&rev=106608
Log:
Merged revisions 106607 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r106607 | tilghman | 2008-03-07 09:22:34 -0600 (Fri, 07 Mar 2008) | 11 lines

Merged revisions 106606 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r106606 | tilghman | 2008-03-07 09:20:52 -0600 (Fri, 07 Mar 2008) | 3 lines

Properly initialize rtp->schedid
(Closes issue #12154)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/rtp.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Fri Mar  7 09:24:00 2008
@@ -1,1 +1,1 @@
-/trunk:1-105595,105675,105677,105733-105734,105773,105785,105804,105840-105841,105864,105899,105933,106036,106040,106139,106186,106238-106239,106329,106346,106399,106438-106439,106501,106507,106518,106553
+/trunk:1-105595,105675,105677,105733-105734,105773,105785,105804,105840-105841,105864,105899,105933,106036,106040,106139,106186,106238-106239,106329,106346,106399,106438-106439,106501,106507,106518,106553,106607

Modified: branches/1.6.0/main/rtp.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/rtp.c?view=diff&rev=106608&r1=106607&r2=106608
==============================================================================
--- branches/1.6.0/main/rtp.c (original)
+++ branches/1.6.0/main/rtp.c Fri Mar  7 09:24:00 2008
@@ -2191,6 +2191,7 @@
 	rtcp->s = rtp_socket("RTCP");
 	rtcp->us.sin_family = AF_INET;
 	rtcp->them.sin_family = AF_INET;
+	rtcp->schedid = -1;
 
 	if (rtcp->s < 0) {
 		ast_free(rtcp);