Bug 972097 - Fix merge failure (lost 'rtcp_'). r=padenot, a=lsblakk
authorRandell Jesup <rjesup@wgate.com>
Fri, 14 Feb 2014 15:56:11 -0800
changeset 176318 4fef9a9dbdf373d11e6a4fa1ed462548eee59f2f
parent 176317 3ceabcc6ff66cad20c90b73ca2fba74edfa6bf9c
child 176319 533e8bcf1404be7c8bef2ff571f371f0e990a29f
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspadenot, lsblakk
bugs972097
milestone28.0
Bug 972097 - Fix merge failure (lost 'rtcp_'). r=padenot, a=lsblakk
media/webrtc/trunk/webrtc/video_engine/vie_receiver.cc
--- a/media/webrtc/trunk/webrtc/video_engine/vie_receiver.cc
+++ b/media/webrtc/trunk/webrtc/video_engine/vie_receiver.cc
@@ -330,17 +330,17 @@ bool ViEReceiver::ParseAndHandleEncapsul
 int ViEReceiver::InsertRTCPPacket(const int8_t* rtcp_packet,
                                   int rtcp_packet_length) {
   // TODO(mflodman) Change decrypt to get rid of this cast.
   int8_t* tmp_ptr = const_cast<int8_t*>(rtcp_packet);
   unsigned char* received_packet = reinterpret_cast<unsigned char*>(tmp_ptr);
   int received_packet_length = rtcp_packet_length;
   {
     CriticalSectionScoped cs(receive_cs_.get());
-    if (!receiving_) {
+    if (!receiving_rtcp_) {
       return -1;
     }
 
     if (external_decryption_) {
       int decrypted_length = kViEMaxMtu;
       external_decryption_->decrypt_rtcp(channel_id_, received_packet,
                                          decryption_buffer_,
                                          received_packet_length,