From 0f15aea0eaa76aee4814ecfb876f91ffa15fbb31 Mon Sep 17 00:00:00 2001 From: "hlundin@google.com" Date: Thu, 16 Jun 2011 11:44:52 +0000 Subject: [PATCH] Fix build error in NetEQ when disabling NETEQ_CNG_CODEC An #ifdef guard was missing, which caused NetEQ not to compile when NETEQ_CNG_CODEC was not defined. This is Issue 10 (http://code.google.com/p/webrtc/issues/detail?id=10). Review URL: http://webrtc-codereview.appspot.com/43002 git-svn-id: http://webrtc.googlecode.com/svn/trunk@91 4adac7df-926f-26a2-2b94-8c16560cd09d --- modules/audio_coding/NetEQ/main/source/recout.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/audio_coding/NetEQ/main/source/recout.c b/modules/audio_coding/NetEQ/main/source/recout.c index 083298691f..63296f90e7 100644 --- a/modules/audio_coding/NetEQ/main/source/recout.c +++ b/modules/audio_coding/NetEQ/main/source/recout.c @@ -341,11 +341,13 @@ int WebRtcNetEQ_RecOutInternal(DSPInst_t *inst, WebRtc_Word16 *pw16_outData, inst->codec_ptr_inst.funcDecodeInit(inst->codec_ptr_inst.codec_state); } +#ifdef NETEQ_CNG_CODEC /* And reset CNG */ if (inst->CNG_Codec_inst != NULL) { WebRtcCng_InitDec(inst->CNG_Codec_inst); } +#endif /*NETEQ_CNG_CODEC*/ } fs_mult = WebRtcNetEQ_CalcFsMult(inst->fs);