summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/amrnb/dec/src/d_plsf_5.cpp
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2014-12-09 14:41:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-09 14:41:17 +0000
commit33cc5c91e4bb9152ed122afacf7423e085420ac8 (patch)
treeba4b32395614a947b40d9efe0cb6ff38600dc51f /media/libstagefright/codecs/amrnb/dec/src/d_plsf_5.cpp
parent853bc5a2379a59859795027a9dd4bc11a54b2a5f (diff)
parentf143b60856d275a9dcda1f3084c768655b242022 (diff)
downloadframeworks_av-33cc5c91e4bb9152ed122afacf7423e085420ac8.zip
frameworks_av-33cc5c91e4bb9152ed122afacf7423e085420ac8.tar.gz
frameworks_av-33cc5c91e4bb9152ed122afacf7423e085420ac8.tar.bz2
am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"
* commit 'f143b60856d275a9dcda1f3084c768655b242022': 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.cpp2
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;