summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jean-Baptiste Queru <jbq@google.com> 2012-01-24 08:43:14 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-01-24 08:43:14 -0800
commit10c4641c2e2f747f8fef7d217d550b7f9a6de588 (patch)
treeff0ae2bcb02cc90b9dec564a6b3f350cb6e42daa
parent9f080e2a5bc6a268934e32201c69ea8a86900396 (diff)
parent2ae5805cf18ad6bdbea5def03a488e14c1a8804c (diff)
am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '2ae5805cf18ad6bdbea5def03a488e14c1a8804c': stagefright aacenc: Properly terminate a comment
-rw-r--r--media/libstagefright/codecs/aacenc/src/adj_thr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/aacenc/src/adj_thr.c b/media/libstagefright/codecs/aacenc/src/adj_thr.c
index c656f65b8a5b..a8ab809f3f60 100644
--- a/media/libstagefright/codecs/aacenc/src/adj_thr.c
+++ b/media/libstagefright/codecs/aacenc/src/adj_thr.c
@@ -1039,7 +1039,7 @@ void AdjThrInit(ADJ_THR_STATE *hAdjThr,
/* 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