commit 61022b06a352e5a6da382a09f51ea624581ada7f
author Jean-Baptiste Queru <jbq@google.com> Fri Feb 24 09:57:51 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 24 09:57:51 2012 -0800
tree aa263b6a776a3ab99a5f869a8419cfa2defc079b
parent 459df4ef8368ea84ce7d07981c6867a7b7fef14e
parent 5f83b95705fa84b87b498d67f3b1b8dc34038474

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

* commit '5f83b95705fa84b87b498d67f3b1b8dc34038474':
  stagefright aacenc: Zero-initialize a struct

media/libstagefright/codecs/aacenc/src/adj_thr.c

diff --git a/media/libstagefright/codecs/aacenc/src/adj_thr.c b/media/libstagefright/codecs/aacenc/src/adj_thr.c
index a8ab809..373b063 100644
--- a/media/libstagefright/codecs/aacenc/src/adj_thr.c
+++ b/media/libstagefright/codecs/aacenc/src/adj_thr.c
@@ -26,6 +26,7 @@
 #include "adj_thr.h"
 #include "qc_data.h"
 #include "line_pe.h"
+#include <string.h>
 
 
 #define  minSnrLimit    0x6666 /* 1 dB */
@@ -1138,6 +1139,7 @@
   Word16 maxBitresBits = elBits->maxBits;
   Word16 sideInfoBits = (qcOE->staticBitsUsed + qcOE->ancBitsUsed);
   Word16 ch;
+  memset(&peData, 0, sizeof(peData));
 
   prepareSfbPe(&peData, psyOutChannel, logSfbEnergy, sfbNRelevantLines, nChannels, AdjThrStateElement->peOffset);