| Index: webrtc/modules/rtp_rtcp/source/rtcp_sender.h
|
| diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender.h b/webrtc/modules/rtp_rtcp/source/rtcp_sender.h
|
| index 76abf63853d03fd4657bf893dfb3f7361c63f588..c9088c7b97231204f3ba6d1d2b15dc57ec1984f8 100644
|
| --- a/webrtc/modules/rtp_rtcp/source/rtcp_sender.h
|
| +++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender.h
|
| @@ -112,14 +112,12 @@ class RTCPSender {
|
| int32_t SendRTCP(const FeedbackState& feedback_state,
|
| RTCPPacketType packetType,
|
| int32_t nackSize = 0,
|
| - const uint16_t* nackList = 0,
|
| - uint64_t pictureID = 0);
|
| + const uint16_t* nackList = 0);
|
|
|
| int32_t SendCompoundRTCP(const FeedbackState& feedback_state,
|
| const std::set<RTCPPacketType>& packetTypes,
|
| int32_t nackSize = 0,
|
| - const uint16_t* nackList = 0,
|
| - uint64_t pictureID = 0);
|
| + const uint16_t* nackList = 0);
|
|
|
| bool REMB() const;
|
|
|
| @@ -186,10 +184,6 @@ class RTCPSender {
|
| EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
|
| std::unique_ptr<rtcp::RtcpPacket> BuildFIR(const RtcpContext& context)
|
| EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
|
| - std::unique_ptr<rtcp::RtcpPacket> BuildSLI(const RtcpContext& context)
|
| - EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
|
| - std::unique_ptr<rtcp::RtcpPacket> BuildRPSI(const RtcpContext& context)
|
| - EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
|
| std::unique_ptr<rtcp::RtcpPacket> BuildNACK(const RtcpContext& context)
|
| EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
|
|
|
|
|