Default to always NACKing residual losses when having both FEC and NACK.

BUG=
TEST=

Review URL: http://webrtc-codereview.appspot.com/296002

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1047 4adac7df-926f-26a2-2b94-8c16560cd09d

src/modules/video_coding/main/source/receiver.cc

@@ -8,12 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "video_coding.h"
-#include "trace.h"
+#include "receiver.h"
+
 #include "encoded_frame.h"
 #include "internal_defines.h"
-#include "receiver.h"
+#include "media_opt_util.h"
 #include "tick_time.h"
+#include "trace.h"
+#include "video_coding.h"
 
 #include <assert.h>
 
@@ -373,7 +375,8 @@ void
 VCMReceiver::SetNackMode(VCMNackMode nackMode)
 {
     CriticalSectionScoped cs(_critSect);
-    _jitterBuffer.SetNackMode(nackMode);
+    // Default to always having NACK enabled in hybrid mode.
+    _jitterBuffer.SetNackMode(nackMode, kLowRttNackMs, -1);
     if (!_master)
     {
         _state = kPassive; // The dual decoder defaults to passive