am 61022b06: am 5f83b957: am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"

* commit '61022b06a352e5a6da382a09f51ea624581ada7f':
  stagefright aacenc: Zero-initialize a struct
This commit is contained in:
Jean-Baptiste Queru
2012-02-24 10:00:56 -08:00
committed by Android Git Automerger

View File

@@ -26,6 +26,7 @@
#include "adj_thr.h" #include "adj_thr.h"
#include "qc_data.h" #include "qc_data.h"
#include "line_pe.h" #include "line_pe.h"
#include <string.h>
#define minSnrLimit 0x6666 /* 1 dB */ #define minSnrLimit 0x6666 /* 1 dB */
@@ -1138,6 +1139,7 @@ void AdjustThresholds(ADJ_THR_STATE *adjThrState,
Word16 maxBitresBits = elBits->maxBits; Word16 maxBitresBits = elBits->maxBits;
Word16 sideInfoBits = (qcOE->staticBitsUsed + qcOE->ancBitsUsed); Word16 sideInfoBits = (qcOE->staticBitsUsed + qcOE->ancBitsUsed);
Word16 ch; Word16 ch;
memset(&peData, 0, sizeof(peData));
prepareSfbPe(&peData, psyOutChannel, logSfbEnergy, sfbNRelevantLines, nChannels, AdjThrStateElement->peOffset); prepareSfbPe(&peData, psyOutChannel, logSfbEnergy, sfbNRelevantLines, nChannels, AdjThrStateElement->peOffset);