summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/amrnb/common/src/gc_pred.cpp
diff options
context:
space:
mode:
authorBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2014-11-27 12:08:59 +0100
committerBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2014-11-27 12:17:40 +0100
commit2d0ac425564ff9882ebaac5267d1a04d4af67d00 (patch)
tree0233791a817ab812f63e4731adf36f03d4dd4dd2 /media/libstagefright/codecs/amrnb/common/src/gc_pred.cpp
parent1a9c3954a20800dda3d6d18048c7f0edc8c53e6a (diff)
downloadframeworks_av-2d0ac425564ff9882ebaac5267d1a04d4af67d00.zip
frameworks_av-2d0ac425564ff9882ebaac5267d1a04d4af67d00.tar.gz
frameworks_av-2d0ac425564ff9882ebaac5267d1a04d4af67d00.tar.bz2
Fix build with clang in C++11 mode
This removes the deprecated register keyword in many places, fixes one instance of passing '\0' where a char* is expected, and 2 switch type narrowing issues. Change-Id: Ie265ac26ff6a61267ad6406dfe237226d97ca9ac Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Diffstat (limited to 'media/libstagefright/codecs/amrnb/common/src/gc_pred.cpp')
-rw-r--r--media/libstagefright/codecs/amrnb/common/src/gc_pred.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/codecs/amrnb/common/src/gc_pred.cpp b/media/libstagefright/codecs/amrnb/common/src/gc_pred.cpp
index 3650f3c..1c8a700 100644
--- a/media/libstagefright/codecs/amrnb/common/src/gc_pred.cpp
+++ b/media/libstagefright/codecs/amrnb/common/src/gc_pred.cpp
@@ -477,9 +477,9 @@ void gc_pred(
Flag *pOverflow
)
{
- register Word16 i;
- register Word32 L_temp1, L_temp2;
- register Word32 L_tmp;
+ Word16 i;
+ Word32 L_temp1, L_temp2;
+ Word32 L_tmp;
Word32 ener_code;
Word32 ener;
Word16 exp, frac;
@@ -993,7 +993,7 @@ void gc_pred_average_limited(
)
{
Word16 av_pred_en;
- register Word16 i;
+ Word16 i;
/* do average in MR122 mode (log2() domain) */
av_pred_en = 0;