diff options
| author | Chih-hung Hsieh <chh@google.com> | 2014-11-25 22:01:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 22:01:47 +0000 |
| commit | a9b15da8df9f596658102fe2b7dfbe114a499867 (patch) | |
| tree | fdc262919d3008d7abc3b6a2d42a4ac7fbe5f42e /media/libstagefright | |
| parent | abf9e2b6190f95b1eb96e1199986d7b00f26a5b6 (diff) | |
| parent | 7fca411f36f76493491fd45f91fac2e9bd70fd6d (diff) | |
| download | frameworks_av-a9b15da8df9f596658102fe2b7dfbe114a499867.zip frameworks_av-a9b15da8df9f596658102fe2b7dfbe114a499867.tar.gz frameworks_av-a9b15da8df9f596658102fe2b7dfbe114a499867.tar.bz2 | |
am 7fca411f: am b44760cf: Merge "Remove deprecated register keyword"
* commit '7fca411f36f76493491fd45f91fac2e9bd70fd6d':
Remove deprecated register keyword
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/codecs/avc/common/src/deblock.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/avc/common/src/deblock.cpp b/media/libstagefright/codecs/avc/common/src/deblock.cpp index de2d2b6..5f8b693 100644 --- a/media/libstagefright/codecs/avc/common/src/deblock.cpp +++ b/media/libstagefright/codecs/avc/common/src/deblock.cpp @@ -1279,7 +1279,7 @@ void EdgeLoop_Luma_vertical(uint8* SrcPtr, uint8 *Strength, int Alpha, int Beta, int C0, c0, dif, AbsDelta, Strng, tmp, tmp1; int L2 = 0, L1, L0, R0, R1, R2 = 0; uint8 *ptr, *ptr1; - register uint R_in, L_in; + uint R_in, L_in; uint R_out, L_out; |