diff options
| author | Andreas Huber <andih@google.com> | 2014-04-11 07:54:53 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2014-04-11 17:12:03 +0000 |
| commit | d411b4ca2945cd8974a3a78199fce94646950128 (patch) | |
| tree | e1c9e21525348fe826b91ecee7075ccb743f843d /media/libstagefright/codecs/aacenc/src/adj_thr.c | |
| parent | 51b3ea2b8f7298bffbd246c65a606cd053357b66 (diff) | |
| download | frameworks_av-d411b4ca2945cd8974a3a78199fce94646950128.zip frameworks_av-d411b4ca2945cd8974a3a78199fce94646950128.tar.gz frameworks_av-d411b4ca2945cd8974a3a78199fce94646950128.tar.bz2 | |
warnings be gone.
(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)
Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts
or errors downstream to a minimum.
Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613
Diffstat (limited to 'media/libstagefright/codecs/aacenc/src/adj_thr.c')
| -rw-r--r-- | media/libstagefright/codecs/aacenc/src/adj_thr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/aacenc/src/adj_thr.c b/media/libstagefright/codecs/aacenc/src/adj_thr.c index ccfe883..471631c 100644 --- a/media/libstagefright/codecs/aacenc/src/adj_thr.c +++ b/media/libstagefright/codecs/aacenc/src/adj_thr.c @@ -72,7 +72,7 @@ static void calcThreshExp(Word32 thrExp[MAX_CHANNELS][MAX_GROUPED_SFB], const Word16 nChannels) { Word16 ch, sfb, sfbGrp; - Word32 *pthrExp, *psfbThre; + Word32 *pthrExp = NULL, *psfbThre; for (ch=0; ch<nChannels; ch++) { PSY_OUT_CHANNEL *psyOutChan = &psyOutChannel[ch]; for(sfbGrp = 0; sfbGrp < psyOutChan->sfbCnt; sfbGrp+= psyOutChan->sfbPerGroup) |