diff options
author | Andreas Gampe <agampe@google.com> | 2015-01-28 16:29:43 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-28 16:29:43 +0000 |
commit | dee9d798a3434bde96852c60953cb531bf9fd18a (patch) | |
tree | 49a6f3c24920aa2e1c5afcea474c441bafe4e1f7 /media/libstagefright/codecs | |
parent | 2ac21a5d35591acc7f7ff4f85fda146ebeaa2551 (diff) | |
parent | 0566949e25bdd541e969af0b5ce1aca405666d5a (diff) | |
download | frameworks_av-dee9d798a3434bde96852c60953cb531bf9fd18a.zip frameworks_av-dee9d798a3434bde96852c60953cb531bf9fd18a.tar.gz frameworks_av-dee9d798a3434bde96852c60953cb531bf9fd18a.tar.bz2 |
am 0566949e: am ba553472: am aeccbffd: Merge "Avoid mixing declarations and statements in C89 source files"
* commit '0566949e25bdd541e969af0b5ce1aca405666d5a':
Avoid mixing declarations and statements in C89 source files
Diffstat (limited to 'media/libstagefright/codecs')
-rw-r--r-- | media/libstagefright/codecs/aacenc/basic_op/oper_32b.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/aacenc/basic_op/oper_32b.c b/media/libstagefright/codecs/aacenc/basic_op/oper_32b.c index d1fe833..4fd16a1 100644 --- a/media/libstagefright/codecs/aacenc/basic_op/oper_32b.c +++ b/media/libstagefright/codecs/aacenc/basic_op/oper_32b.c @@ -245,10 +245,9 @@ Word16 iLog4(Word32 value) Word32 rsqrt(Word32 value, /*!< Operand to square root (0.0 ... 1) */ Word32 accuracy) /*!< Number of valid bits that will be calculated */ { - UNUSED(accuracy); - Word32 root = 0; Word32 scale; + UNUSED(accuracy); if(value < 0) return 0; |