diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-27 13:14:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-27 13:14:45 -0800 |
| commit | c0502b930651092683a5f47c55159b559fae7727 (patch) | |
| tree | f0ea7935c9b04cdb7c261cbe49910ef0b8031ddb /media/libstagefright/codecs/aacenc/src | |
| parent | df712ea86e6350f7005a02ab0e1c60c28a343ed0 (diff) | |
| parent | 7917b452eae7340fcab09b7b406d9d8ca28a4a87 (diff) | |
| download | frameworks_av-c0502b930651092683a5f47c55159b559fae7727.zip frameworks_av-c0502b930651092683a5f47c55159b559fae7727.tar.gz frameworks_av-c0502b930651092683a5f47c55159b559fae7727.tar.bz2 | |
am 5b299d2f: am 18643e70: am 6bc542e0: am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"
* commit '5b299d2f9038452aa09a97d4f2ce57ec20bbc06a':
stagefright aacenc: Don't address a Word32 with a Word16 pointer
Diffstat (limited to 'media/libstagefright/codecs/aacenc/src')
| -rw-r--r-- | media/libstagefright/codecs/aacenc/src/sf_estim.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/aacenc/src/sf_estim.c b/media/libstagefright/codecs/aacenc/src/sf_estim.c index fe40137..bc320ec 100644 --- a/media/libstagefright/codecs/aacenc/src/sf_estim.c +++ b/media/libstagefright/codecs/aacenc/src/sf_estim.c @@ -400,7 +400,7 @@ static void assimilateSingleScf(PSY_OUT_CHANNEL *psyOutChan, Word16 *minScfCalculated, Flag restartOnSuccess) { - Word32 sfbLast, sfbAct, sfbNext, scfAct, scfMin; + Word16 sfbLast, sfbAct, sfbNext, scfAct, scfMin; Word16 *scfLast, *scfNext; Word32 sfbPeOld, sfbPeNew; Word32 sfbDistNew; |