commit ece3890d3a40fe911ae895e28c329491e795b14d
author pbos@webrtc.org <pbos@webrtc.org> Fri Nov 14 11:52:04 2014 +0000
committer pbos@webrtc.org <pbos@webrtc.org> Fri Nov 14 11:52:04 2014 +0000
tree 4cff912ea0f1695ba2aa658d5ec87e129cbac5d2
parent 35c1ace18532b50ff274f65b1369889baefca319

Report total bitrate for all streams in GetStats.

This regression wasn't caught because I accidentally disabled multiple
streams for EndToEndTest.GetStats in a refactoring.

R=stefan@webrtc.org, xians@webrtc.org
BUG=1667

Review URL: https://webrtc-codereview.appspot.com/27179004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7701 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/rtp_rtcp/source/rtcp_receiver.h

diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
index 087722c..ecc5ebe 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
@@ -49,8 +49,7 @@
     uint32_t RelaySSRC() const;
 
     void RegisterRtcpObservers(RtcpIntraFrameObserver* intra_frame_callback,
-                               RtcpBandwidthObserver* bandwidth_callback,
-                               RtcpFeedback* feedback_callback);
+                               RtcpBandwidthObserver* bandwidth_callback);
 
     int32_t IncomingRTCPPacket(
         RTCPHelp::RTCPPacketInformation& rtcpPacketInformation,
@@ -228,7 +227,6 @@
   ModuleRtpRtcpImpl&      _rtpRtcp;
 
   CriticalSectionWrapper* _criticalSectionFeedbacks;
-  RtcpFeedback*           _cbRtcpFeedback;
   RtcpBandwidthObserver*  _cbRtcpBandwidthObserver;
   RtcpIntraFrameObserver* _cbRtcpIntraFrameObserver;