diff options
author | Lajos Molnar <lajos@google.com> | 2014-12-09 01:22:04 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-09 01:22:05 +0000 |
commit | d1aeff5597785336af3bba34cfddb0ebbc6b2397 (patch) | |
tree | 1aa283b82f707311e6c8ff6a5df1f59425cab5d9 /media/libstagefright/codecs/amrnb/common/src/mult_r.cpp | |
parent | 66172f5cd25d1ce05870be70ad4f5fc0af6289f0 (diff) | |
parent | 2d0ac425564ff9882ebaac5267d1a04d4af67d00 (diff) | |
download | frameworks_av-d1aeff5597785336af3bba34cfddb0ebbc6b2397.zip frameworks_av-d1aeff5597785336af3bba34cfddb0ebbc6b2397.tar.gz frameworks_av-d1aeff5597785336af3bba34cfddb0ebbc6b2397.tar.bz2 |
Merge "Fix build with clang in C++11 mode"
Diffstat (limited to 'media/libstagefright/codecs/amrnb/common/src/mult_r.cpp')
-rw-r--r-- | media/libstagefright/codecs/amrnb/common/src/mult_r.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/amrnb/common/src/mult_r.cpp b/media/libstagefright/codecs/amrnb/common/src/mult_r.cpp index 0777e68..7112b3d 100644 --- a/media/libstagefright/codecs/amrnb/common/src/mult_r.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/mult_r.cpp @@ -190,7 +190,7 @@ Word16 mult_r (Word16 var1, Word16 var2) Word16 mult_r(Word16 var1, Word16 var2, Flag *pOverflow) { - register Word32 L_product_arr; + Word32 L_product_arr; L_product_arr = ((Word32) var1) * var2; /* product */ L_product_arr += (Word32) 0x00004000L; /* round */ |