commit adbbf7a791599cf13494525f7a1359b0cc2dd2f9
author Jean-Baptiste Queru <jbq@google.com> Tue Jan 24 08:46:26 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 24 08:46:26 2012 -0800
tree 24f086af65d9affa86b092d707eb04a185b7f7fc
parent cbe2f48d3f12a8189509314e098e04ecbce7c810
parent 10c4641c2e2f747f8fef7d217d550b7f9a6de588

am 10c4641c: am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"

* commit '10c4641c2e2f747f8fef7d217d550b7f9a6de588':
  stagefright aacenc: Properly terminate a comment

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 c656f65..a8ab809 100644
--- a/media/libstagefright/codecs/aacenc/src/adj_thr.c
+++ b/media/libstagefright/codecs/aacenc/src/adj_thr.c
@@ -1039,7 +1039,7 @@
 
   /* minSnr adaptation */
   /* maximum reduction of minSnr goes down to minSnr^maxRed */
-  msaParam->maxRed = 0x20000000;     /* *0.25f /
+  msaParam->maxRed = 0x20000000;     /* *0.25f */
   /* start adaptation of minSnr for avgEn/sfbEn > startRatio */
   msaParam->startRatio = 0x0ccccccd; /* 10 */
   /* maximum minSnr reduction to minSnr^maxRed is reached for