| Index: webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
 | 
| diff --git a/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
 | 
| index 90f7784bfb44b6ce5788a0cab73c561b46728b0f..a332d7ce5eeb7a98c3b0495fc51a8593ddbc4492 100644
 | 
| --- a/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
 | 
| +++ b/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
 | 
| @@ -189,9 +189,9 @@ class RtpData {
 | 
|   public:
 | 
|    virtual ~RtpData() {}
 | 
|  
 | 
| -  virtual int32_t OnReceivedPayloadData(const uint8_t* payloadData,
 | 
| -                                        size_t payloadSize,
 | 
| -                                        const WebRtcRTPHeader* rtpHeader) = 0;
 | 
| +  virtual int32_t OnReceivedPayloadData(const uint8_t* payload_data,
 | 
| +                                        size_t payload_size,
 | 
| +                                        const WebRtcRTPHeader* rtp_header) = 0;
 | 
|  
 | 
|    virtual bool OnRecoveredPacket(const uint8_t* packet,
 | 
|                                   size_t packet_length) = 0;
 | 
| @@ -206,15 +206,15 @@ class RtpFeedback {
 | 
|    *   channels    - number of channels in codec (1 = mono, 2 = stereo)
 | 
|    */
 | 
|    virtual int32_t OnInitializeDecoder(
 | 
| -      const int8_t payloadType,
 | 
| -      const char payloadName[RTP_PAYLOAD_NAME_SIZE],
 | 
| -      const int frequency,
 | 
| -      const size_t channels,
 | 
| -      const uint32_t rate) = 0;
 | 
| +      int8_t payload_type,
 | 
| +      const char payload_name[RTP_PAYLOAD_NAME_SIZE],
 | 
| +      int frequency,
 | 
| +      size_t channels,
 | 
| +      uint32_t rate) = 0;
 | 
|  
 | 
| -  virtual void OnIncomingSSRCChanged(const uint32_t ssrc) = 0;
 | 
| +  virtual void OnIncomingSSRCChanged(uint32_t ssrc) = 0;
 | 
|  
 | 
| -  virtual void OnIncomingCSRCChanged(const uint32_t CSRC, const bool added) = 0;
 | 
| +  virtual void OnIncomingCSRCChanged(uint32_t csrc, bool added) = 0;
 | 
|  };
 | 
|  
 | 
|  class RtcpIntraFrameObserver {
 | 
| @@ -326,16 +326,16 @@ class NullRtpFeedback : public RtpFeedback {
 | 
|   public:
 | 
|    virtual ~NullRtpFeedback() {}
 | 
|  
 | 
| -  int32_t OnInitializeDecoder(const int8_t payloadType,
 | 
| +  int32_t OnInitializeDecoder(int8_t payload_type,
 | 
|                                const char payloadName[RTP_PAYLOAD_NAME_SIZE],
 | 
| -                              const int frequency,
 | 
| -                              const size_t channels,
 | 
| -                              const uint32_t rate) override {
 | 
| +                              int frequency,
 | 
| +                              size_t channels,
 | 
| +                              uint32_t rate) override {
 | 
|      return 0;
 | 
|    }
 | 
|  
 | 
| -  void OnIncomingSSRCChanged(const uint32_t ssrc) override {}
 | 
| -  void OnIncomingCSRCChanged(const uint32_t CSRC, const bool added) override {}
 | 
| +  void OnIncomingSSRCChanged(uint32_t ssrc) override {}
 | 
| +  void OnIncomingCSRCChanged(uint32_t csrc, bool added) override {}
 | 
|  };
 | 
|  
 | 
|  // Null object version of RtpData.
 | 
| @@ -343,9 +343,9 @@ class NullRtpData : public RtpData {
 | 
|   public:
 | 
|    virtual ~NullRtpData() {}
 | 
|  
 | 
| -  int32_t OnReceivedPayloadData(const uint8_t* payloadData,
 | 
| -                                size_t payloadSize,
 | 
| -                                const WebRtcRTPHeader* rtpHeader) override {
 | 
| +  int32_t OnReceivedPayloadData(const uint8_t* payload_data,
 | 
| +                                size_t payload_size,
 | 
| +                                const WebRtcRTPHeader* rtp_header) override {
 | 
|      return 0;
 | 
|    }
 | 
|  
 | 
| 
 |