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 98f7c26b553ee7f67ee53e120df977dfcbba43a9..6cb1375fe9d77eb623640317dfea17c60ec7f008 100644
--- a/webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h
+++ b/webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h
@@ -600,19 +600,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;