diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-27 13:07:16 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-27 13:07:16 -0800 |
| commit | 59e82a04949ffca325508f5ebf43fdb8657e350c (patch) | |
| tree | e5d9a0b598da1ff1fbdf7c453fef468664981867 /media | |
| parent | 7917b452eae7340fcab09b7b406d9d8ca28a4a87 (diff) | |
| parent | d78b7149dd619c73b1160ba68a7e05ffdd50cb0c (diff) | |
| download | frameworks_av-59e82a04949ffca325508f5ebf43fdb8657e350c.zip frameworks_av-59e82a04949ffca325508f5ebf43fdb8657e350c.tar.gz frameworks_av-59e82a04949ffca325508f5ebf43fdb8657e350c.tar.bz2 | |
am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"
* commit '94ee1bf232d1f1cc97902dab1e4148eb478cd304':
stagefright amrwbenc: Change keyword ordering
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/amrwbenc/inc/isp_isf.tab | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/amrwbenc/inc/isp_isf.tab b/media/libstagefright/codecs/amrwbenc/inc/isp_isf.tab index 97c3b68..865eea0 100644 --- a/media/libstagefright/codecs/amrwbenc/inc/isp_isf.tab +++ b/media/libstagefright/codecs/amrwbenc/inc/isp_isf.tab @@ -21,7 +21,7 @@ /* table of cos(x) in Q15 */ -const static Word16 table[129] = { +static const Word16 table[129] = { 32767, 32758, 32729, 32679, 32610, 32522, 32413, 32286, 32138, 31972, 31786, 31581, 31357, 31114, 30853, 30572, 30274, @@ -42,7 +42,7 @@ const static Word16 table[129] = { /* slope in Q11 used to compute y = acos(x) */ -const static Word16 slope[128] = { +static const Word16 slope[128] = { -26214, -9039, -5243, -3799, -2979, -2405, -2064, -1771, -1579, -1409, -1279, -1170, -1079, -1004, -933, -880, -827, -783, -743, -708, -676, -647, -621, -599, |