Merge branch '1.0-local' into trunk-local

* 1.0-local:
  Makes sure that we always remove targets when reinitializing rtp
  Fix yahoo login problems with strange chars in password.
cusax-fix
scmerger 17 years ago
parent 532ae2f11b
commit f6363c99a4

@ -451,7 +451,7 @@ public void startStreaming()
if(!startedAtLeastOneAudioStream
&& !startedAtLeastOneVideoStream
&& sendStreams != null
&& sendStreams != null
&& (sendStreams.size() > 0))
{
stopStreaming();
@ -1616,14 +1616,10 @@ private SessionDescription createSessionDescription(
{
allocateMediaPorts = true;
}
else if ((intendedDestination != null)
&& !intendedDestination.equals(lastIntendedDestination))
else if ((intendedDestination != null))
{
//we already have ongoing streams so we kill them
stopStreaming(false);
//audioRtpManager = RTPManager.newInstance();
//videoRtpManager = RTPManager.newInstance();
//allocateMediaPorts = true;
}
if (allocateMediaPorts)
{

Loading…
Cancel
Save