Merge methods for configuring NACK/FEC/hybrid.

webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 256 matching lines @@
   int32_t SendRTCPSliceLossIndication(uint8_t picture_id) override;
 
   // Set method for requesting a new key frame.
   int32_t SetKeyFrameRequestMethod(KeyFrameRequestMethod method) override;
 
   // Send a request for a keyframe.
   int32_t RequestKeyFrame() override;
 
   void SetTargetSendBitrate(uint32_t bitrate_bps) override;
 
-  int32_t SetGenericFECStatus(bool enable,
-                              uint8_t payload_type_red,
-                              uint8_t payload_type_fec) override;
+  void SetGenericFECStatus(bool enable,
+                           uint8_t payload_type_red,
+                           uint8_t payload_type_fec) override;
 
-  int32_t GenericFECStatus(bool& enable,
-                           uint8_t& payload_type_red,
-                           uint8_t& payload_type_fec) override;
+  void GenericFECStatus(bool& enable,
+                        uint8_t& payload_type_red,
+                        uint8_t& payload_type_fec) override;
 
   int32_t SetFecParameters(const FecProtectionParams* delta_params,
                            const FecProtectionParams* key_params) override;
 
   bool LastReceivedNTP(uint32_t* NTPsecs,
                        uint32_t* NTPfrac,
                        uint32_t* remote_sr) const;
 
   bool LastReceivedXrReferenceTimeInfo(RtcpReceiveTimeInfo* info) const;
 
@@ skipping 81 matching lines @@
   RtcpRttStats* rtt_stats_;
 
   // The processed RTT from RtcpRttStats.
   rtc::scoped_ptr<CriticalSectionWrapper> critical_section_rtt_;
   int64_t rtt_ms_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_