commit 18643e705a50f6c1c865e56e75d8403422a76d65
author Jean-Baptiste Queru <jbq@google.com> Mon Feb 27 13:09:40 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 27 13:09:40 2012 -0800
tree 9def7c3655cd0af426a08be3f39726a54a6c9fe8
parent c76ca242ce2bd26c97c78ddf6842429850f541d9
parent 6bc542e0f31bcb7ce5ff466c7aa4676f6aa91f7d

am 6bc542e0: am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"

* commit '6bc542e0f31bcb7ce5ff466c7aa4676f6aa91f7d':
  stagefright aacenc: Don't address a Word32 with a Word16 pointer

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

diff --git a/media/libstagefright/codecs/aacenc/src/sf_estim.c b/media/libstagefright/codecs/aacenc/src/sf_estim.c
index fe40137..bc320ec 100644
--- a/media/libstagefright/codecs/aacenc/src/sf_estim.c
+++ b/media/libstagefright/codecs/aacenc/src/sf_estim.c
@@ -400,7 +400,7 @@
                                 Word16 *minScfCalculated,
                                 Flag    restartOnSuccess)
 {
-	Word32 sfbLast, sfbAct, sfbNext, scfAct, scfMin;
+	Word16 sfbLast, sfbAct, sfbNext, scfAct, scfMin;
 	Word16 *scfLast, *scfNext;
 	Word32 sfbPeOld, sfbPeNew;
 	Word32 sfbDistNew;