commit d78b7149dd619c73b1160ba68a7e05ffdd50cb0c
author Jean-Baptiste Queru <jbq@google.com> Mon Feb 27 11:06:24 2012 -0800
committer android code review <noreply-gerritcodereview@google.com> Mon Feb 27 11:06:25 2012 -0800
tree 42b77638f854318642b486fea52aef9610c0b310
parent 5b9c33c7239c996135c0021ec9a0d9afedd81a78
parent b0238c30a22778bdb4ac7c86a1eb65e50e32f2ec

Merge "stagefright amrwbenc: Change keyword ordering"

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;