diff options
| author | Andreas Gampe <agampe@google.com> | 2014-12-08 18:31:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-08 18:31:25 +0000 |
| commit | ce48b3a821f0c17aa68b114d964a26fce22cdd49 (patch) | |
| tree | f3b2490a81823ce91bea33e2318d0abfe1a5f232 /media | |
| parent | 93f5b333d31fd5fe425faa01b25d1b4d3115a8e6 (diff) | |
| parent | f3df58c77ea506fb00e696313b0ea127dbebf02c (diff) | |
| download | frameworks_av-ce48b3a821f0c17aa68b114d964a26fce22cdd49.zip frameworks_av-ce48b3a821f0c17aa68b114d964a26fce22cdd49.tar.gz frameworks_av-ce48b3a821f0c17aa68b114d964a26fce22cdd49.tar.bz2 | |
am f3df58c7: Merge "Stagefright: Fix unused variables"
* commit 'f3df58c77ea506fb00e696313b0ea127dbebf02c':
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; |