| Index: webrtc/modules/rtp_rtcp/source/rtcp_packet.cc | 
| diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc | 
| index 7c0650c488cf87183842f6f7cafcf7c834607ef0..fd413116037bbbe482c39e91c6e8f46250d63914 100644 | 
| --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc | 
| +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc | 
| @@ -251,33 +251,6 @@ void CreateApp(const RTCPPacketAPP& app, | 
| *pos += app.Size; | 
| } | 
|  | 
| -// RFC 4585: Feedback format. | 
| -// | 
| -// Common packet format: | 
| -// | 
| -//    0                   1                   2                   3 | 
| -//    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 | 
| -//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | 
| -//   |V=2|P|   FMT   |       PT      |          length               | | 
| -//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | 
| -//   |                  SSRC of packet sender                        | | 
| -//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | 
| -//   |                  SSRC of media source                         | | 
| -//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | 
| -//   :            Feedback Control Information (FCI)                 : | 
| -//   : | 
| -// | 
| - | 
| -// Picture loss indication (PLI) (RFC 4585). | 
| -// | 
| -// FCI: no feedback control information. | 
| - | 
| -void CreatePli(const RTCPPacketPSFBPLI& pli, | 
| -               uint8_t* buffer, | 
| -               size_t* pos) { | 
| -  AssignUWord32(buffer, pos, pli.SenderSSRC); | 
| -  AssignUWord32(buffer, pos, pli.MediaSSRC); | 
| -} | 
|  | 
| // Slice loss indication (SLI) (RFC 4585). | 
| // | 
| @@ -861,20 +834,6 @@ bool App::Create(uint8_t* packet, | 
| return true; | 
| } | 
|  | 
| -bool Pli::Create(uint8_t* packet, | 
| -                 size_t* index, | 
| -                 size_t max_length, | 
| -                 RtcpPacket::PacketReadyCallback* callback) const { | 
| -  while (*index + BlockLength() > max_length) { | 
| -    if (!OnBufferFull(packet, index, callback)) | 
| -      return false; | 
| -  } | 
| -  const uint8_t kFmt = 1; | 
| -  CreateHeader(kFmt, PT_PSFB, HeaderLength(), packet, index); | 
| -  CreatePli(pli_, packet, index); | 
| -  return true; | 
| -} | 
| - | 
| bool Sli::Create(uint8_t* packet, | 
| size_t* index, | 
| size_t max_length, | 
|  |