Merge methods for configuring NACK/FEC/hybrid.

webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h

Index: webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h
diff --git a/webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h b/webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h
index 7a960881c93fa0d6a5681a7e4a528986f2c9ad4a..3dccee8a4652e83d937e0c50761802d0d5f9ef06 100644
--- a/webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h
+++ b/webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h
@@ -608,19 +608,15 @@ class RtpRtcp : public Module {
 
     /*
     *   Turn on/off generic FEC
-    *
-    *   return -1 on failure else 0
     */
-    virtual int32_t SetGenericFECStatus(bool enable,
-                                        uint8_t payloadTypeRED,
-                                        uint8_t payloadTypeFEC) = 0;
+    virtual void SetGenericFECStatus(bool enable,
+                                     uint8_t payload_type_red,
+                                     uint8_t payload_type_fec) = 0;
 
     /*
     *   Get generic FEC setting
-    *
-    *   return -1 on failure else 0
     */
-    virtual int32_t GenericFECStatus(bool& enable,
+    virtual void GenericFECStatus(bool& enable,
                                      uint8_t& payloadTypeRED,
                                      uint8_t& payloadTypeFEC) = 0;