From 353cd37ae9660ec9088e810d5fe68c92a8928266 Mon Sep 17 00:00:00 2001
From: "buildbot@webrtc.org"
 <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Fri, 15 Aug 2014 18:26:12 +0000
Subject: [PATCH] (Auto)update libjingle 73370064-> 73399579

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6911 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 talk/p2p/base/dtlstransportchannel.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/talk/p2p/base/dtlstransportchannel.cc b/talk/p2p/base/dtlstransportchannel.cc
index c41d38388..e0f414170 100644
--- a/talk/p2p/base/dtlstransportchannel.cc
+++ b/talk/p2p/base/dtlstransportchannel.cc
@@ -298,6 +298,11 @@ bool DtlsTransportChannelWrapper::SetSrtpCiphers(
   if (srtp_ciphers_ == ciphers)
     return true;
 
+  if (dtls_state_ == STATE_STARTED) {
+    LOG(LS_WARNING) << "Ignoring new SRTP ciphers while DTLS is negotiating";
+    return true;
+  }
+
   if (dtls_state_ == STATE_OPEN) {
     // We don't support DTLS renegotiation currently. If new set of srtp ciphers
     // are different than what's being used currently, we will not use it.