commit 79d6dafd3dac32e505bc1a2ccc83ef3ceb6c5ad3
author wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Dec 13 19:17:43 2013
committer wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Dec 13 19:17:43 2013
tree 49fa17e3dea3df39d5194a9bc15f115bfcf61999
parent 7ff4089bfcce71ba2a5d21d5adc0467782a914a0

Update talk to 58174641 together with http://review.webrtc.org/4319005/.

R=turaj@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/5809004

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

modules/audio_coding/neteq/webrtc_neteq.c

diff --git a/modules/audio_coding/neteq/webrtc_neteq.c b/modules/audio_coding/neteq/webrtc_neteq.c
index de1ccd1..fad690d 100644
--- a/modules/audio_coding/neteq/webrtc_neteq.c
+++ b/modules/audio_coding/neteq/webrtc_neteq.c
@@ -1104,14 +1104,6 @@
         /* If CN or internal CNG */
         *outputType = kOutputCNG;
 
-#ifdef NETEQ_VAD
-    }
-    else if ( NetEqMainInst->DSPinst.VADInst.VADDecision == 0 )
-    {
-        /* post-decode VAD says passive speaker */
-        *outputType = kOutputVADPassive;
-#endif /* NETEQ_VAD */
-
     }
     else if ((NetEqMainInst->DSPinst.w16_mode == MODE_EXPAND)
         && (NetEqMainInst->DSPinst.ExpandInst.w16_expandMuteFactor == 0))
@@ -1125,6 +1117,14 @@
         /* PLC mode */
         *outputType = kOutputPLC;
 
+#ifdef NETEQ_VAD
+    }
+    else if ( NetEqMainInst->DSPinst.VADInst.VADDecision == 0 )
+    {
+        /* post-decode VAD says passive speaker */
+        *outputType = kOutputVADPassive;
+#endif /* NETEQ_VAD */
+
     }
     else
     {