From dd478e20814a495fa10351eb20d0ce34ea2cc464 Mon Sep 17 00:00:00 2001 From: "henrik.lundin@webrtc.org" Date: Tue, 31 Jan 2012 13:12:41 +0000 Subject: [PATCH] Fix for warning in GCC 4.6 Upstream copy of a fix provided in http://codereview.chromium.org/9159058/. Review URL: https://webrtc-codereview.appspot.com/369024 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1580 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/audio_coding/neteq/merge.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/audio_coding/neteq/merge.c b/src/modules/audio_coding/neteq/merge.c index 11ff41211c..5f020a97ac 100644 --- a/src/modules/audio_coding/neteq/merge.c +++ b/src/modules/audio_coding/neteq/merge.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -112,7 +112,7 @@ int WebRtcNetEQ_Merge(DSPInst_t *inst, WebRtc_Word16 pw16_corrVec[4+60+4]; #endif WebRtc_Word16 *pw16_corr = &pw16_corrVec[4]; - WebRtc_Word16 w16_stopPos, w16_bestIndex, w16_interpLen; + WebRtc_Word16 w16_stopPos = 0, w16_bestIndex, w16_interpLen; WebRtc_Word16 w16_bestVal; /* bestVal is dummy */ WebRtc_Word16 w16_startfact, w16_inc; WebRtc_Word16 w16_expandedLen;