diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-27 10:58:50 -0800 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-02-27 10:58:51 -0800 |
| commit | 5b9c33c7239c996135c0021ec9a0d9afedd81a78 (patch) | |
| tree | 05d40088490e9b7124d48b387bb30027fd558d8d /media/libstagefright/codecs/aacenc | |
| parent | b86b3c8f976b70635770d93217132d4023ecf33f (diff) | |
| parent | 2f0fb8c1ec139d385feb6990111ed6dc93422eac (diff) | |
| download | frameworks_av-5b9c33c7239c996135c0021ec9a0d9afedd81a78.zip frameworks_av-5b9c33c7239c996135c0021ec9a0d9afedd81a78.tar.gz frameworks_av-5b9c33c7239c996135c0021ec9a0d9afedd81a78.tar.bz2 | |
Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer"
Diffstat (limited to 'media/libstagefright/codecs/aacenc')
| -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; |