diff options
| author | Lajos Molnar <lajos@google.com> | 2014-12-09 01:34:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-09 01:34:42 +0000 |
| commit | f143b60856d275a9dcda1f3084c768655b242022 (patch) | |
| tree | 1aa283b82f707311e6c8ff6a5df1f59425cab5d9 /media/libstagefright/codecs/amrnb/dec/src/d_plsf_5.cpp | |
| parent | f3c253464e0047a28960b27bbee7366d5bd63327 (diff) | |
| parent | d1aeff5597785336af3bba34cfddb0ebbc6b2397 (diff) | |
| download | frameworks_av-f143b60856d275a9dcda1f3084c768655b242022.zip frameworks_av-f143b60856d275a9dcda1f3084c768655b242022.tar.gz frameworks_av-f143b60856d275a9dcda1f3084c768655b242022.tar.bz2 | |
am d1aeff55: Merge "Fix build with clang in C++11 mode"
* commit 'd1aeff5597785336af3bba34cfddb0ebbc6b2397':
Fix build with clang in C++11 mode
Diffstat (limited to 'media/libstagefright/codecs/amrnb/dec/src/d_plsf_5.cpp')
| -rw-r--r-- | media/libstagefright/codecs/amrnb/dec/src/d_plsf_5.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/amrnb/dec/src/d_plsf_5.cpp b/media/libstagefright/codecs/amrnb/dec/src/d_plsf_5.cpp index 08b690d..7068c0a 100644 --- a/media/libstagefright/codecs/amrnb/dec/src/d_plsf_5.cpp +++ b/media/libstagefright/codecs/amrnb/dec/src/d_plsf_5.cpp @@ -308,7 +308,7 @@ void D_plsf_5( Flag *pOverflow /* o : Flag set when overflow occurs */ ) { - register Word16 i; + Word16 i; Word16 temp; Word16 sign; |