diff options
| author | Andreas Gampe <agampe@google.com> | 2014-12-09 11:25:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-09 11:25:35 +0000 |
| commit | 80ddb73058d33fa45408a3538649867eda3f881b (patch) | |
| tree | ac225ea65933a76e7e4a797796d3f40c603f6894 /media | |
| parent | 9574b6440b47a2c79fcfdf54a7ec3dd24dd88ef0 (diff) | |
| parent | ce48b3a821f0c17aa68b114d964a26fce22cdd49 (diff) | |
| download | frameworks_av-80ddb73058d33fa45408a3538649867eda3f881b.zip frameworks_av-80ddb73058d33fa45408a3538649867eda3f881b.tar.gz frameworks_av-80ddb73058d33fa45408a3538649867eda3f881b.tar.bz2 | |
am ce48b3a8: am f3df58c7: Merge "Stagefright: Fix unused variables"
* commit 'ce48b3a821f0c17aa68b114d964a26fce22cdd49':
Stagefright: Fix unused variables
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/aacenc/basic_op/basic_op.h | 3 | ||||
| -rw-r--r-- | media/libstagefright/codecs/aacenc/src/block_switch.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/media/libstagefright/codecs/aacenc/basic_op/basic_op.h b/media/libstagefright/codecs/aacenc/basic_op/basic_op.h index 5cd7e5f..bbc753b 100644 --- a/media/libstagefright/codecs/aacenc/basic_op/basic_op.h +++ b/media/libstagefright/codecs/aacenc/basic_op/basic_op.h @@ -518,8 +518,6 @@ __inline Word32 L_shl(Word32 L_var1, Word16 var2) return ASM_L_shr( L_var1, -var2); } #else - Word32 L_var_out = 0L; - if (var2 <= 0) { L_var1 = L_shr(L_var1, (Word16)-var2); @@ -540,7 +538,6 @@ __inline Word32 L_shl(Word32 L_var1, Word16 var2) } } L_var1 <<= 1; - L_var_out = L_var1; } } return (L_var1); diff --git a/media/libstagefright/codecs/aacenc/src/block_switch.c b/media/libstagefright/codecs/aacenc/src/block_switch.c index 2878ad3..11bc7e7 100644 --- a/media/libstagefright/codecs/aacenc/src/block_switch.c +++ b/media/libstagefright/codecs/aacenc/src/block_switch.c @@ -277,7 +277,7 @@ Word32 CalcWindowEnergy(BLOCK_SWITCHING_CONTROL *blockSwitchingControl, Word16 chIncrement, Word16 windowLen) { - Word32 w, i, wOffset, tidx, ch; + Word32 w, i, tidx; Word32 accuUE, accuFE; Word32 tempUnfiltered; Word32 tempFiltered; |