diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-27 13:14:48 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-27 13:14:48 -0800 |
| commit | f2f4a649d71aea5066d609c10cd9449df9abd453 (patch) | |
| tree | 700724e0704d1a0edb1a42805154a6c00e68a8fd /media/libstagefright/codecs/amrwbenc | |
| parent | c0502b930651092683a5f47c55159b559fae7727 (diff) | |
| parent | 59e82a04949ffca325508f5ebf43fdb8657e350c (diff) | |
| download | frameworks_av-f2f4a649d71aea5066d609c10cd9449df9abd453.zip frameworks_av-f2f4a649d71aea5066d609c10cd9449df9abd453.tar.gz frameworks_av-f2f4a649d71aea5066d609c10cd9449df9abd453.tar.bz2 | |
am eb483de5: am bf5c5e5b: am c1da1e1b: am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"
* commit 'eb483de58e4b41cb549149459e492e9ad1d65bd0':
stagefright amrwbenc: Change keyword ordering
Diffstat (limited to 'media/libstagefright/codecs/amrwbenc')
| -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, |