Don't send FEC for H.264 with NACK enabled.

webrtc/video/vie_channel.cc

Index: webrtc/video/vie_channel.cc
diff --git a/webrtc/video/vie_channel.cc b/webrtc/video/vie_channel.cc
index d49f505365933aeb11705bbbe20dab17a8a5fb07..743f8600abf175c0597769f3436b0436e7d28c90 100644
--- a/webrtc/video/vie_channel.cc
+++ b/webrtc/video/vie_channel.cc
@@ -414,13 +414,15 @@ void ViEChannel::SetProtectionMode(bool enable_nack,
                                    bool enable_fec,
                                    int payload_type_red,
                                    int payload_type_fec) {
-  // Validate payload types.
-  if (enable_fec) {
+  // Validate payload types. If either RED of FEC payload types are set then

[stefan-webrtc, 2016/02/12 12:03:19]

red or fec

[pbos-webrtc, 2016/02/12 12:34:48]

Done.

+  // both should be. If FEC is enabled then they both have to be set.
+  if (enable_fec || payload_type_red != -1 || payload_type_fec != -1) {
     RTC_DCHECK_GE(payload_type_red, 0);
     RTC_DCHECK_GE(payload_type_fec, 0);
     RTC_DCHECK_LE(payload_type_red, 127);
     RTC_DCHECK_LE(payload_type_fec, 127);
   } else {
+    // Payload types unset.
     RTC_DCHECK_EQ(payload_type_red, -1);
     RTC_DCHECK_EQ(payload_type_fec, -1);
     // Set to valid uint8_ts to be castable later without signed overflows.