commit 979df012eb0588ac7f87d5f6e8bff77e2049ee46
author Jean-Baptiste Queru <jbq@google.com> Mon Aug 13 15:19:13 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 13 15:19:13 2012 -0700
tree bcc146ce1765013b95360d46e2498f547f68fa0a
parent 10004fe612bc38bedc258fd1c380ebccacfa0c1e
parent 98159acd68307bf0fcec40ae0fffc1a715517d1d

am 98159acd: Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow"

* commit '98159acd68307bf0fcec40ae0fffc1a715517d1d':
  amrnb: Restart the p_xn pointer when retraversing the array on overflow

media/libstagefright/codecs/amrnb/enc/src/g_pitch.cpp

diff --git a/media/libstagefright/codecs/amrnb/enc/src/g_pitch.cpp b/media/libstagefright/codecs/amrnb/enc/src/g_pitch.cpp
index f6235ad..5b80e2a 100644
--- a/media/libstagefright/codecs/amrnb/enc/src/g_pitch.cpp
+++ b/media/libstagefright/codecs/amrnb/enc/src/g_pitch.cpp
@@ -400,8 +400,9 @@
     }
     else
     {
-        s = 0;                      /* Avoid case of all zeros */
+        s = 0;  /* re-initialize calculations */
         p_y1 = &y1[0];
+        p_xn = &xn[0];
         for (i = (L_subfr >> 2); i != 0; i--)
         {
             L_temp = (Word32)(*(p_y1++) >> 2);